diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-03-16 09:28:03 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-16 09:28:03 +0000 |
| commit | 2de6d4a9e46c9bb038e9970628ed4b8e199ffda3 (patch) | |
| tree | b30bd0efa71a0047569aecd839d68a160e4061b2 /drivers | |
| parent | 5320918b9a87865223fd6b228e530bf30bc64d9d (diff) | |
| download | blackbird-op-linux-2de6d4a9e46c9bb038e9970628ed4b8e199ffda3.tar.gz blackbird-op-linux-2de6d4a9e46c9bb038e9970628ed4b8e199ffda3.zip | |
drm: fix build with UDL if USB is a module
reported by sfr on -next merge.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -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 \ drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \ drm_crtc.o drm_modes.o drm_edid.o \ drm_info.o drm_debugfs.o drm_encoder_slave.o \ - drm_trace_points.o drm_global.o drm_usb.o + drm_trace_points.o drm_global.o +drm-$(CONFIG_USB) += drm_usb.o drm-$(CONFIG_COMPAT) += drm_ioc32.o 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 @@ #include <linux/usb.h> #include <linux/export.h> -#ifdef CONFIG_USB int drm_get_usb_dev(struct usb_interface *interface, const struct usb_device_id *id, struct drm_driver *driver) @@ -115,4 +114,3 @@ void drm_usb_exit(struct drm_driver *driver, usb_deregister(udriver); } EXPORT_SYMBOL(drm_usb_exit); -#endif |
