mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-16 08:44:21 +08:00
drm/usb: move usb support into a separate module
In order to satisfy all the various Kconfig options between USB and DRM, we need to split the USB code out into a separate module and export symbols to it. This fixes build problems in -next reported by sfr. Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
2de6d4a9e4
commit
9c1dfc5574
@ -18,6 +18,11 @@ menuconfig DRM
|
||||
details. You should also select and configure AGP
|
||||
(/dev/agpgart) support if it is available for your platform.
|
||||
|
||||
config DRM_USB
|
||||
tristate
|
||||
depends on DRM
|
||||
select USB
|
||||
|
||||
config DRM_KMS_HELPER
|
||||
tristate
|
||||
depends on DRM
|
||||
|
@ -14,9 +14,10 @@ drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \
|
||||
drm_info.o drm_debugfs.o drm_encoder_slave.o \
|
||||
drm_trace_points.o drm_global.o
|
||||
|
||||
drm-$(CONFIG_USB) += drm_usb.o
|
||||
drm-$(CONFIG_COMPAT) += drm_ioc32.o
|
||||
|
||||
drm-usb-y := drm_usb.o
|
||||
|
||||
drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_i2c_helper.o
|
||||
|
||||
obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
|
||||
@ -24,6 +25,7 @@ obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
|
||||
CFLAGS_drm_trace_points.o := -I$(src)
|
||||
|
||||
obj-$(CONFIG_DRM) += drm.o
|
||||
obj-$(CONFIG_DRM_USB) += drm_usb.o
|
||||
obj-$(CONFIG_DRM_TTM) += ttm/
|
||||
obj-$(CONFIG_DRM_TDFX) += tdfx/
|
||||
obj-$(CONFIG_DRM_R128) += r128/
|
||||
|
@ -986,6 +986,7 @@ int drm_mode_group_init_legacy_group(struct drm_device *dev,
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(drm_mode_group_init_legacy_group);
|
||||
|
||||
/**
|
||||
* drm_mode_config_cleanup - free up DRM mode_config info
|
||||
|
@ -319,6 +319,7 @@ int drm_fill_in_dev(struct drm_device *dev,
|
||||
drm_lastclose(dev);
|
||||
return retcode;
|
||||
}
|
||||
EXPORT_SYMBOL(drm_fill_in_dev);
|
||||
|
||||
|
||||
/**
|
||||
@ -397,6 +398,7 @@ err_idr:
|
||||
*minor = NULL;
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(drm_get_minor);
|
||||
|
||||
/**
|
||||
* Put a secondary minor number.
|
||||
@ -428,6 +430,7 @@ int drm_put_minor(struct drm_minor **minor_p)
|
||||
*minor_p = NULL;
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(drm_put_minor);
|
||||
|
||||
static void drm_unplug_minor(struct drm_minor *minor)
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
config DRM_UDL
|
||||
tristate "DisplayLink"
|
||||
depends on DRM && EXPERIMENTAL
|
||||
select USB
|
||||
select DRM_USB
|
||||
select FB_SYS_FILLRECT
|
||||
select FB_SYS_COPYAREA
|
||||
select FB_SYS_IMAGEBLIT
|
||||
|
Loading…
Reference in New Issue
Block a user