diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 17:04:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 17:04:29 -0800 |
| commit | ce519e2327bff01d0eb54071e7044e6291a52aa6 (patch) | |
| tree | e032d398d00a6bb20d815dea29cbdaf339795745 /arch/h8300 | |
| parent | 40d7ee5d162203b40b5f4fbb312ab016edddb97f (diff) | |
| parent | 7a9c67a6ad2e6911e7ebdae34a75835c537d6e84 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (237 commits)
Staging: android: binder: fix build errors
Staging: android: add lowmemorykiller driver
Staging: android: remove dummy android.c driver
Staging: android: timed_gpio: Rename android_timed_gpio to timed_gpio
Staging: android: add timed_gpio driver
Staging: android: add ram_console driver
Staging: android: add logging driver
staging: android: binder: Fix use of euid
Staging: android: binder: Fix gcc warnings about improper format specifiers for size_t in printk
Staging: android: add binder driver
Staging: add android framework
Staging: epl: fix netdev->priv b0rkage
Staging: epl: hr timers all run in hard irq context now
Staging: epl: run Lindent on *.c files
Staging: epl: run Lindent on *.h files
Staging: epl: run Lindent on all user/*.h files
Staging: epl: run Lindent on all kernel/*.h files
Staging: add epl stack
Staging: frontier: fix compiler warnings
Staging: frontier: remove unused alphatrack_sysfs.c file
...
Diffstat (limited to 'arch/h8300')
| -rw-r--r-- | arch/h8300/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 28f06fd9b7b..9420648352b 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig @@ -220,6 +220,8 @@ source "drivers/uwb/Kconfig" endmenu +source "drivers/staging/Kconfig" + source "fs/Kconfig" source "arch/h8300/Kconfig.debug" |