Commit fce875d6 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau: move compat ioctl out of nouveau_drv.h

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent c0077061
...@@ -168,6 +168,7 @@ nouveau-y += nv50_fbcon.o nvc0_fbcon.o ...@@ -168,6 +168,7 @@ nouveau-y += nv50_fbcon.o nvc0_fbcon.o
# drm/kms/nvd9- # drm/kms/nvd9-
# other random bits # other random bits
nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
nouveau-$(CONFIG_ACPI) += nouveau_acpi.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 ...@@ -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 nouveau-y += nouveau_mem.o
# optional stuff # optional stuff
nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "nouveau_pm.h" #include "nouveau_pm.h"
#include "nv50_display.h" #include "nv50_display.h"
#include "nouveau_acpi.h" #include "nouveau_acpi.h"
#include "nouveau_ioctl.h"
#include "drm_pciids.h" #include "drm_pciids.h"
......
...@@ -405,9 +405,6 @@ int nouveau_ttm_mmap(struct file *, struct vm_area_struct *); ...@@ -405,9 +405,6 @@ int nouveau_ttm_mmap(struct file *, struct vm_area_struct *);
/* nouveau_hdmi.c */ /* nouveau_hdmi.c */
void nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *); 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 */ /* nvd0_display.c */
extern int nvd0_display_create(struct drm_device *); extern int nvd0_display_create(struct drm_device *);
extern void nvd0_display_destroy(struct drm_device *); extern void nvd0_display_destroy(struct drm_device *);
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "drmP.h" #include "drmP.h"
#include "drm.h" #include "drm.h"
#include "nouveau_drv.h" #include "nouveau_ioctl.h"
/** /**
* Called whenever a 32-bit process running under a 64-bit kernel * Called whenever a 32-bit process running under a 64-bit kernel
......
#ifndef __NOUVEAU_IOCTL_H__
#define __NOUVEAU_IOCTL_H__
long nouveau_compat_ioctl(struct file *, unsigned int cmd, unsigned long arg);
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment