summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorDavid Vrabel <dv02@dv02pc01.europe.root.pri>2008-10-10 11:47:31 +0100
committerDavid Vrabel <dv02@dv02pc01.europe.root.pri>2008-10-10 11:47:31 +0100
commit99ee3a6d4577e7633c66304e4aefeca5489c8d5c (patch)
tree94dbf1db8b2efb6b4fdaf6fdaa86de655c64ff1c /arch/arm
parent3fa8749e584b55f1180411ab1b51117190bac1e5 (diff)
parentedfa042c880f62848aa55b3e71e538fe383929da (diff)
downloadop-kernel-dev-99ee3a6d4577e7633c66304e4aefeca5489c8d5c.zip
op-kernel-dev-99ee3a6d4577e7633c66304e4aefeca5489c8d5c.tar.gz
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb into for-upstream
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 70dba16..8eedbfa 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1220,6 +1220,8 @@ source "drivers/hid/Kconfig"
source "drivers/usb/Kconfig"
+source "drivers/uwb/Kconfig"
+
source "drivers/mmc/Kconfig"
source "drivers/leds/Kconfig"
OpenPOWER on IntegriCloud