aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/Kconfig
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-07-13 17:23:39 -0700
committerColin Cross <ccross@android.com>2011-07-13 17:23:39 -0700
commit32d6e08c0f755313e2461d848a941dfb79948556 (patch)
tree3bc8a19ff9e23713e45e6ac6e7072059d4da74b0 /drivers/Kconfig
parent5fc5470c62dfd3fd5b1252049a9eca8ca12cab42 (diff)
parent43cc7e1ec0b77d1e80bcee7889a308ae85da9366 (diff)
downloadkernel_samsung_espresso10-32d6e08c0f755313e2461d848a941dfb79948556.zip
kernel_samsung_espresso10-32d6e08c0f755313e2461d848a941dfb79948556.tar.gz
kernel_samsung_espresso10-32d6e08c0f755313e2461d848a941dfb79948556.tar.bz2
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'drivers/Kconfig')
-rw-r--r--drivers/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig
index d930c6a..1cce7f2 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -133,4 +133,6 @@ source "drivers/remoteproc/Kconfig"
source "drivers/virtio/Kconfig"
source "drivers/rpmsg/Kconfig"
+
+source "drivers/omap_hsi/Kconfig"
endmenu