diff options
author | Dave Airlie <airlied@redhat.com> | 2012-03-16 05:28:03 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-03-16 05:28:03 -0400 |
commit | 2de6d4a9e46c9bb038e9970628ed4b8e199ffda3 (patch) | |
tree | b30bd0efa71a0047569aecd839d68a160e4061b2 | |
parent | 5320918b9a87865223fd6b228e530bf30bc64d9d (diff) |
drm: fix build with UDL if USB is a module
reported by sfr on -next merge.
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/Makefile | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_usb.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 7f2029726db4..ed407cc7f26f 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile | |||
@@ -12,8 +12,9 @@ drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \ | |||
12 | drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \ | 12 | drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \ |
13 | drm_crtc.o drm_modes.o drm_edid.o \ | 13 | drm_crtc.o drm_modes.o drm_edid.o \ |
14 | drm_info.o drm_debugfs.o drm_encoder_slave.o \ | 14 | drm_info.o drm_debugfs.o drm_encoder_slave.o \ |
15 | drm_trace_points.o drm_global.o drm_usb.o | 15 | drm_trace_points.o drm_global.o |
16 | 16 | ||
17 | drm-$(CONFIG_USB) += drm_usb.o | ||
17 | drm-$(CONFIG_COMPAT) += drm_ioc32.o | 18 | drm-$(CONFIG_COMPAT) += drm_ioc32.o |
18 | 19 | ||
19 | drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_i2c_helper.o | 20 | drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_i2c_helper.o |
diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c index 445003f4dc93..c8c83dad2ce1 100644 --- a/drivers/gpu/drm/drm_usb.c +++ b/drivers/gpu/drm/drm_usb.c | |||
@@ -2,7 +2,6 @@ | |||
2 | #include <linux/usb.h> | 2 | #include <linux/usb.h> |
3 | #include <linux/export.h> | 3 | #include <linux/export.h> |
4 | 4 | ||
5 | #ifdef CONFIG_USB | ||
6 | int drm_get_usb_dev(struct usb_interface *interface, | 5 | int drm_get_usb_dev(struct usb_interface *interface, |
7 | const struct usb_device_id *id, | 6 | const struct usb_device_id *id, |
8 | struct drm_driver *driver) | 7 | struct drm_driver *driver) |
@@ -115,4 +114,3 @@ void drm_usb_exit(struct drm_driver *driver, | |||
115 | usb_deregister(udriver); | 114 | usb_deregister(udriver); |
116 | } | 115 | } |
117 | EXPORT_SYMBOL(drm_usb_exit); | 116 | EXPORT_SYMBOL(drm_usb_exit); |
118 | #endif | ||