Merge commit 'origin' into master

[linux-2.6] / drivers / staging / wlan-ng / Kconfig

config PRISM2_USB
        tristate "Prism2.5 USB driver"
        depends on USB
        default n
        ---help---
          This is the wlan-ng prism 2.5 USB driver for a wide range of
          old USB wireless devices.

          To compile this driver as a module, choose M here: the module
          will be called prism2_usb.