summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2004-08-04 10:53:21 +0000
committerDave Airlie <airlied@linux.ie>2004-08-04 10:53:21 +0000
commitbe3e54bc15aadf26743a8d0150b8fa38952863b4 (patch)
treeedfd0a8ca9dc389b1530fa00d720902d25f01669 /linux-core
parent6c9715eaf502587c58acfaea420a4fdf29bd7221 (diff)
2.4 hotplug compat
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drmP.h1
-rw-r--r--linux-core/drm_compat.h8
-rw-r--r--linux-core/drm_stub.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 7b136dfe..8ac39bb0 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -569,6 +569,7 @@ typedef struct drm_vbl_sig {
#endif
+
/**
* DRM device structure.
*/
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h
index 3bb0b709..5b1b2312 100644
--- a/linux-core/drm_compat.h
+++ b/linux-core/drm_compat.h
@@ -120,12 +120,16 @@ struct device;
#define class_simple_device_add(...) do {} while (0)
-static inline void class_simple_device_remove(dev_t dev){};
+static inline void class_simple_device_remove(dev_t dev){}
-static inline void class_simple_destroy(struct class_simple *cs){};
+static inline void class_simple_destroy(struct class_simple *cs){}
static inline struct class_simple *class_simple_create(struct module *owner, char *name) { return (struct class_simple *)owner; }
+static inline void drm_hotplug(void) {}
+
+static inline void class_simple_set_hotplug(struct class_simple *cs, void (*fn)(void));
+
#ifndef pci_pretty_name
#define pci_pretty_name(x) x->name
#endif
diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c
index d61f73ee..9dbf5617 100644
--- a/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@ -76,6 +76,7 @@ static struct file_operations DRM(stub_fops) = {
.open = DRM(stub_open)
};
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
static int drm_hotplug (struct class_device *dev, char **envp, int num_envp,
char *buffer, int buffer_size)
{
@@ -142,6 +143,7 @@ static int drm_hotplug (struct class_device *dev, char **envp, int num_envp,
return 0;
}
+#endif
/**
* Get a device minor number.