diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 17:13:10 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 17:13:10 +0100 |
| commit | 7b3b6e42032e94a6132a85642e95106f5346650e (patch) | |
| tree | 8b2262291341d8a9f9b1e7e3c63a3289bb6c6de6 /drivers/Kconfig | |
| parent | 04172c0b9ea5861e5cba7909da5297b3aedac9e1 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into topic/asoc
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 59f33fa6af3..d38f43f593d 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -78,6 +78,8 @@ source "drivers/hid/Kconfig" source "drivers/usb/Kconfig" +source "drivers/uwb/Kconfig" + source "drivers/mmc/Kconfig" source "drivers/memstick/Kconfig" @@ -101,4 +103,6 @@ source "drivers/auxdisplay/Kconfig" source "drivers/uio/Kconfig" source "drivers/xen/Kconfig" + +source "drivers/staging/Kconfig" endmenu |