diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:13:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:13:00 -0700 |
| commit | f063a0c0c995d010960efcc1b2ed14b99674f25c (patch) | |
| tree | 106e30acd1a58b3cf9f3c15abe1de83f1919e03b /drivers/staging/Kconfig | |
| parent | 3c3762957818dc902222733a8184f23102e24472 (diff) | |
| parent | 5af634789c93b97cfb314a102436716be8fbc577 (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: (841 commits)
Staging: brcm80211: fix usage of roundup in structures
Staging: bcm: fix up network device reference counting
Staging: keucr: fix up US_ macro change
staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.
staging: brcm80211: Remove unnecessary header files.
staging: brcm80211: Remove unnecessary includes from bcmutils.c
staging: brcm80211: Removed unnecessary pktsetprio() function.
Staging: brcm80211: remove typedefs.h
Staging: brcm80211: remove uintptr typedef usage
Staging: hv: remove struct vmbus_channel_interface
Staging: hv: remove Open from struct vmbus_channel_interface
Staging: hv: storvsc: call vmbus_open directly
Staging: hv: netvsc: call vmbus_open directly
Staging: hv: channel: export vmbus_open to modules
Staging: hv: remove Close from struct vmbus_channel_interface
Staging: hv: netvsc: call vmbus_close directly
Staging: hv: storvsc: call vmbus_close directly
Staging: hv: channel: export vmbus_close to modules
Staging: hv: remove SendPacket from struct vmbus_channel_interface
Staging: hv: storvsc: call vmbus_sendpacket directly
...
Fix up conflicts in
drivers/staging/cx25821/cx25821-audio-upstream.c
drivers/staging/cx25821/cx25821-audio.h
due to warring whitespace cleanups (neither of which were all that great)
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 2ea91e04925..f9c9c8a397d 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -63,7 +63,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" @@ -71,24 +71,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" @@ -147,6 +151,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" @@ -155,5 +161,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 |