diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 06:28:35 (GMT) |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 06:28:35 (GMT) |
| commit | 57b8628bb0ac4e47c806e45c5bbd89282e93869b (patch) | |
| tree | ee9289f0898054474b7e5054abdb3ffb78666436 /drivers/Kconfig | |
| parent | 486c8aba39e5f194519cd5c0e85e5d1de8b74b03 (diff) | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
| download | linux-57b8628bb0ac4e47c806e45c5bbd89282e93869b.tar.xz | |
Merge commit 'v3.4-rc4' into next
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 5afe5d1..d236aef 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -40,8 +40,6 @@ source "drivers/net/Kconfig" source "drivers/isdn/Kconfig" -source "drivers/telephony/Kconfig" - # input before char - char/joystick depends on it. As does USB. source "drivers/input/Kconfig" @@ -52,6 +50,8 @@ source "drivers/i2c/Kconfig" source "drivers/spi/Kconfig" +source "drivers/hsi/Kconfig" + source "drivers/pps/Kconfig" source "drivers/ptp/Kconfig" @@ -132,6 +132,10 @@ source "drivers/clocksource/Kconfig" source "drivers/iommu/Kconfig" +source "drivers/remoteproc/Kconfig" + +source "drivers/rpmsg/Kconfig" + source "drivers/virt/Kconfig" source "drivers/devfreq/Kconfig" |