diff options
| author | David Vrabel <dv02@dv02pc01.europe.root.pri> | 2008-10-10 06:47:31 -0400 |
|---|---|---|
| committer | David Vrabel <dv02@dv02pc01.europe.root.pri> | 2008-10-10 06:47:31 -0400 |
| commit | 99ee3a6d4577e7633c66304e4aefeca5489c8d5c (patch) | |
| tree | 94dbf1db8b2efb6b4fdaf6fdaa86de655c64ff1c /arch | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | edfa042c880f62848aa55b3e71e538fe383929da (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb into for-upstream
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/cris/Kconfig | 2 | ||||
| -rw-r--r-- | arch/h8300/Kconfig | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 70dba1668907..8eedbfa52f00 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1220,6 +1220,8 @@ source "drivers/hid/Kconfig" | |||
| 1220 | 1220 | ||
| 1221 | source "drivers/usb/Kconfig" | 1221 | source "drivers/usb/Kconfig" |
| 1222 | 1222 | ||
| 1223 | source "drivers/uwb/Kconfig" | ||
| 1224 | |||
| 1223 | source "drivers/mmc/Kconfig" | 1225 | source "drivers/mmc/Kconfig" |
| 1224 | 1226 | ||
| 1225 | source "drivers/leds/Kconfig" | 1227 | source "drivers/leds/Kconfig" |
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 9389d38f222f..cb66c4da25ca 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
| @@ -677,6 +677,8 @@ source "fs/Kconfig" | |||
| 677 | 677 | ||
| 678 | source "drivers/usb/Kconfig" | 678 | source "drivers/usb/Kconfig" |
| 679 | 679 | ||
| 680 | source "drivers/uwb/Kconfig" | ||
| 681 | |||
| 680 | source "arch/cris/Kconfig.debug" | 682 | source "arch/cris/Kconfig.debug" |
| 681 | 683 | ||
| 682 | source "security/Kconfig" | 684 | source "security/Kconfig" |
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 396ab059efa3..2b413325e885 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig | |||
| @@ -213,6 +213,8 @@ source "drivers/hwmon/Kconfig" | |||
| 213 | 213 | ||
| 214 | source "drivers/usb/Kconfig" | 214 | source "drivers/usb/Kconfig" |
| 215 | 215 | ||
| 216 | source "drivers/uwb/Kconfig" | ||
| 217 | |||
| 216 | endmenu | 218 | endmenu |
| 217 | 219 | ||
| 218 | source "fs/Kconfig" | 220 | source "fs/Kconfig" |