diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/Kconfig | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 8e03e7600239..7069eb66f888 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -59,7 +59,7 @@ source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/echo/Kconfig" -source "drivers/staging/otus/Kconfig" +source "drivers/staging/brcm80211/Kconfig" source "drivers/staging/rt2860/Kconfig" @@ -67,24 +67,28 @@ source "drivers/staging/rt2870/Kconfig" source "drivers/staging/comedi/Kconfig" +source "drivers/staging/olpc_dcon/Kconfig" + source "drivers/staging/asus_oled/Kconfig" source "drivers/staging/panel/Kconfig" source "drivers/staging/rtl8187se/Kconfig" -source "drivers/staging/rtl8192su/Kconfig" - source "drivers/staging/rtl8192u/Kconfig" source "drivers/staging/rtl8192e/Kconfig" +source "drivers/staging/rtl8712/Kconfig" + source "drivers/staging/frontier/Kconfig" source "drivers/staging/dream/Kconfig" source "drivers/staging/pohmelfs/Kconfig" +source "drivers/staging/autofs/Kconfig" + source "drivers/staging/phison/Kconfig" source "drivers/staging/line6/Kconfig" @@ -143,6 +147,8 @@ source "drivers/staging/msm/Kconfig" source "drivers/staging/lirc/Kconfig" +source "drivers/staging/smbfs/Kconfig" + source "drivers/staging/easycap/Kconfig" source "drivers/staging/solo6x10/Kconfig" @@ -151,5 +157,21 @@ source "drivers/staging/tidspbridge/Kconfig" source "drivers/staging/quickstart/Kconfig" +source "drivers/staging/westbridge/Kconfig" + +source "drivers/staging/sbe-2t3e3/Kconfig" + +source "drivers/staging/ath6kl/Kconfig" + +source "drivers/staging/keucr/Kconfig" + +source "drivers/staging/bcm/Kconfig" + +source "drivers/staging/ft1000/Kconfig" + +source "drivers/staging/intel_sst/Kconfig" + +source "drivers/staging/speakup/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGING |