diff options
| author | Colin Cross <ccross@android.com> | 2011-06-14 11:48:33 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 11:48:33 -0700 |
| commit | 9bb71b69d988cd7def734f0c4b1cdaaa27be16f7 (patch) | |
| tree | 04bb70c657a01bef17d1f7d86f6e39f8e21b2fed /drivers/Kconfig | |
| parent | c086adace33b592fa8924e84a4f6d4e5bbe0b176 (diff) | |
| parent | d38c274febe1291ecce80b081ca7ecaa5db89719 (diff) | |
| download | kernel_samsung_tuna-9bb71b69d988cd7def734f0c4b1cdaaa27be16f7.zip kernel_samsung_tuna-9bb71b69d988cd7def734f0c4b1cdaaa27be16f7.tar.gz kernel_samsung_tuna-9bb71b69d988cd7def734f0c4b1cdaaa27be16f7.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Conflicts:
Documentation/cpu-freq/governors.txt
drivers/cpufreq/Kconfig
drivers/cpufreq/Makefile
include/linux/cpufreq.h
Change-Id: I3df552521b721b7590883071633873caba33cffd
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 85ac967..d930c6a 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -96,6 +96,8 @@ source "drivers/leds/Kconfig" source "drivers/nfc/Kconfig" +source "drivers/switch/Kconfig" + source "drivers/accessibility/Kconfig" source "drivers/infiniband/Kconfig" |