projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 83xx
[linux-drm-fsl-dcu.git]
/
drivers
/
Kconfig
diff --git
a/drivers/Kconfig
b/drivers/Kconfig
index 8b11cebe65df5ad396f8fb975e158466f9dd859b..e7da9fa724ec5f50aa70040df67c10c2d7cbf2fe 100644
(file)
--- a/
drivers/Kconfig
+++ b/
drivers/Kconfig
@@
-14,10
+14,16
@@
source "drivers/pnp/Kconfig"
source "drivers/block/Kconfig"
source "drivers/block/Kconfig"
+# misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4
+
+source "drivers/misc/Kconfig"
+
source "drivers/ide/Kconfig"
source "drivers/scsi/Kconfig"
source "drivers/ide/Kconfig"
source "drivers/scsi/Kconfig"
+source "drivers/ata/Kconfig"
+
source "drivers/cdrom/Kconfig"
source "drivers/md/Kconfig"
source "drivers/cdrom/Kconfig"
source "drivers/md/Kconfig"
@@
-50,8
+56,6
@@
source "drivers/w1/Kconfig"
source "drivers/hwmon/Kconfig"
source "drivers/hwmon/Kconfig"
-source "drivers/misc/Kconfig"
-
source "drivers/mfd/Kconfig"
source "drivers/media/Kconfig"
source "drivers/mfd/Kconfig"
source "drivers/media/Kconfig"
@@
-60,6
+64,8
@@
source "drivers/video/Kconfig"
source "sound/Kconfig"
source "sound/Kconfig"
+source "drivers/hid/Kconfig"
+
source "drivers/usb/Kconfig"
source "drivers/mmc/Kconfig"
source "drivers/usb/Kconfig"
source "drivers/mmc/Kconfig"
@@
-74,4
+80,6
@@
source "drivers/rtc/Kconfig"
source "drivers/dma/Kconfig"
source "drivers/dma/Kconfig"
+source "drivers/kvm/Kconfig"
+
endmenu
endmenu