aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/drm/drmP.h2
-rw-r--r--include/drm/drm_os_linux.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 90a99807e48d..c34a2cc2d9b6 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -915,7 +915,7 @@ struct drm_driver {
915 915
916 /* these have to be filled in */ 916 /* these have to be filled in */
917 917
918 irqreturn_t(*irq_handler) (DRM_IRQ_ARGS); 918 irqreturn_t(*irq_handler) (int irq, void *arg);
919 void (*irq_preinstall) (struct drm_device *dev); 919 void (*irq_preinstall) (struct drm_device *dev);
920 int (*irq_postinstall) (struct drm_device *dev); 920 int (*irq_postinstall) (struct drm_device *dev);
921 void (*irq_uninstall) (struct drm_device *dev); 921 void (*irq_uninstall) (struct drm_device *dev);
diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h
index 42ce450420dd..2794cfeb4dfb 100644
--- a/include/drm/drm_os_linux.h
+++ b/include/drm/drm_os_linux.h
@@ -48,9 +48,6 @@ static inline void writeq(u64 val, void __iomem *reg)
48/** Read/write memory barrier */ 48/** Read/write memory barrier */
49#define DRM_MEMORYBARRIER() mb() 49#define DRM_MEMORYBARRIER() mb()
50 50
51/** IRQ handler arguments and return type and values */
52#define DRM_IRQ_ARGS int irq, void *arg
53
54/** Other copying of data to kernel space */ 51/** Other copying of data to kernel space */
55#define DRM_COPY_FROM_USER(arg1, arg2, arg3) \ 52#define DRM_COPY_FROM_USER(arg1, arg2, arg3) \
56 copy_from_user(arg1, arg2, arg3) 53 copy_from_user(arg1, arg2, arg3)