| Message ID | 1353390830-25909-1-git-send-email-sachin.kamat@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
ping On 20 November 2012 11:23, Sachin Kamat <sachin.kamat@linaro.org> wrote: > nouveau_ttm.h was included twice. > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> > --- > drivers/gpu/drm/nouveau/nouveau_drm.c | 2 -- > 1 files changed, 0 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c > index 0910125..a1e3fed 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_drm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c > @@ -49,8 +49,6 @@ > #include "nouveau_fbcon.h" > #include "nouveau_fence.h" > > -#include "nouveau_ttm.h" > - > MODULE_PARM_DESC(config, "option string to pass to driver core"); > static char *nouveau_config; > module_param_named(config, nouveau_config, charp, 0400); > -- > 1.7.4.1 >
On Tue, 2012-11-27 at 09:04 +0530, Sachin Kamat wrote: > ping > > On 20 November 2012 11:23, Sachin Kamat <sachin.kamat@linaro.org> wrote: > > nouveau_ttm.h was included twice. I've queued it in my tree, thanks! Ben. > > > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> > > --- > > drivers/gpu/drm/nouveau/nouveau_drm.c | 2 -- > > 1 files changed, 0 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c > > index 0910125..a1e3fed 100644 > > --- a/drivers/gpu/drm/nouveau/nouveau_drm.c > > +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c > > @@ -49,8 +49,6 @@ > > #include "nouveau_fbcon.h" > > #include "nouveau_fence.h" > > > > -#include "nouveau_ttm.h" > > - > > MODULE_PARM_DESC(config, "option string to pass to driver core"); > > static char *nouveau_config; > > module_param_named(config, nouveau_config, charp, 0400); > > -- > > 1.7.4.1 > > > > >
On 27 November 2012 09:09, Ben Skeggs <bskeggs@redhat.com> wrote: > On Tue, 2012-11-27 at 09:04 +0530, Sachin Kamat wrote: >> ping >> >> On 20 November 2012 11:23, Sachin Kamat <sachin.kamat@linaro.org> wrote: >> > nouveau_ttm.h was included twice. > I've queued it in my tree, thanks! Thanks Ben. There is also another patch for which I have just pinged. Please check. > > Ben. > >> > >> > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> >> > --- >> > drivers/gpu/drm/nouveau/nouveau_drm.c | 2 -- >> > 1 files changed, 0 insertions(+), 2 deletions(-) >> > >> > diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c >> > index 0910125..a1e3fed 100644 >> > --- a/drivers/gpu/drm/nouveau/nouveau_drm.c >> > +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c >> > @@ -49,8 +49,6 @@ >> > #include "nouveau_fbcon.h" >> > #include "nouveau_fence.h" >> > >> > -#include "nouveau_ttm.h" >> > - >> > MODULE_PARM_DESC(config, "option string to pass to driver core"); >> > static char *nouveau_config; >> > module_param_named(config, nouveau_config, charp, 0400); >> > -- >> > 1.7.4.1 >> > >> >> >> > >
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 0910125..a1e3fed 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -49,8 +49,6 @@ #include "nouveau_fbcon.h" #include "nouveau_fence.h" -#include "nouveau_ttm.h" - MODULE_PARM_DESC(config, "option string to pass to driver core"); static char *nouveau_config; module_param_named(config, nouveau_config, charp, 0400);
nouveau_ttm.h was included twice. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> --- drivers/gpu/drm/nouveau/nouveau_drm.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)