diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-06-17 10:42:03 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-06-17 10:42:03 +1000 |
| commit | c29fe1ed5b710c823e64f2aba6f57be7a2025eb9 (patch) | |
| tree | 77109ae27c506d64dbbae96732f9948dcc05d046 /arch/cris/Kconfig | |
| parent | 344d0da835431d06e6ab84fe3520a0a5f16f9f6a (diff) | |
| parent | 3bcbcbc48e2ac9f1580324137fabe5d56110bde3 (diff) | |
Merge remote-tracking branch 'm68k/for-next'
Conflicts:
arch/cris/arch-v32/drivers/Kconfig
Diffstat (limited to 'arch/cris/Kconfig')
| -rw-r--r-- | arch/cris/Kconfig | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 6533d0b8d10c..c23ae28f18c2 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -556,40 +556,10 @@ endchoice endmenu -source "drivers/base/Kconfig" - -# standard linux drivers -source "drivers/mtd/Kconfig" - -source "drivers/parport/Kconfig" - -source "drivers/pnp/Kconfig" - -source "drivers/block/Kconfig" - -source "drivers/ide/Kconfig" - -source "drivers/net/Kconfig" - -source "drivers/i2c/Kconfig" - -source "drivers/rtc/Kconfig" - -# -# input before char - char/joystick depends on it. As does USB. -# -source "drivers/input/Kconfig" - -source "drivers/char/Kconfig" +source "drivers/Kconfig" source "fs/Kconfig" -source "drivers/usb/Kconfig" - -source "drivers/uwb/Kconfig" - -source "drivers/staging/Kconfig" - source "arch/cris/Kconfig.debug" source "security/Kconfig" |