diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-25 22:54:33 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 03:12:58 (GMT) |
| commit | fce875d647171f9f740587a252fc026aaa421afe (patch) | |
| tree | e028834a3f74c454fe4d5d966006a2db9281ff41 /drivers | |
| parent | c0077061e7ea3a8c1c316c87a79976bf8f00beb5 (diff) | |
| download | linux-fce875d647171f9f740587a252fc026aaa421afe.tar.xz | |
drm/nouveau: move compat ioctl out of nouveau_drv.h
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/Makefile | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_ioc32.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_ioctl.h | 6 |
5 files changed, 9 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile index c1ce650f..a333c95 100644 --- a/drivers/gpu/drm/nouveau/Makefile +++ b/drivers/gpu/drm/nouveau/Makefile @@ -168,6 +168,7 @@ nouveau-y += nv50_fbcon.o nvc0_fbcon.o # drm/kms/nvd9- # other random bits +nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o nouveau-$(CONFIG_ACPI) += nouveau_acpi.o ## @@ -201,7 +202,6 @@ nouveau-y += nv04_pm.o nv40_pm.o nv50_pm.o nva3_pm.o nvc0_pm.o nouveau-y += nouveau_mem.o # optional stuff -nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index 6a5d548..2047721 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c @@ -37,6 +37,7 @@ #include "nouveau_pm.h" #include "nv50_display.h" #include "nouveau_acpi.h" +#include "nouveau_ioctl.h" #include "drm_pciids.h" diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index ffe2b0f..5d2da1b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -405,9 +405,6 @@ int nouveau_ttm_mmap(struct file *, struct vm_area_struct *); /* nouveau_hdmi.c */ void nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *); -extern long nouveau_compat_ioctl(struct file *file, unsigned int cmd, - unsigned long arg); - /* nvd0_display.c */ extern int nvd0_display_create(struct drm_device *); extern void nvd0_display_destroy(struct drm_device *); diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c index 475ba81..6ac560e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c +++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c @@ -36,7 +36,7 @@ #include "drmP.h" #include "drm.h" -#include "nouveau_drv.h" +#include "nouveau_ioctl.h" /** * Called whenever a 32-bit process running under a 64-bit kernel diff --git a/drivers/gpu/drm/nouveau/nouveau_ioctl.h b/drivers/gpu/drm/nouveau/nouveau_ioctl.h new file mode 100644 index 0000000..ef2b290 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nouveau_ioctl.h @@ -0,0 +1,6 @@ +#ifndef __NOUVEAU_IOCTL_H__ +#define __NOUVEAU_IOCTL_H__ + +long nouveau_compat_ioctl(struct file *, unsigned int cmd, unsigned long arg); + +#endif |