[GIT PATCH] STAGING fixes for .39 - try 2

[GIT PATCH] STAGING fixes for .39 - try 2

[Greg KH]

Here are a number of minor staging driver fixes for your .39-rc tree, again.
One more fix has been added since I sent this to you for the .39-rc5 tree, so
that pull request would generate a different diff than this one.

All of these fix errors that have been reported by people.  There is one
usbip bugfix for a runtime issue as well.

Please pull from:
	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/staging-2.6.git/ staging-linus

All of these patches have been in the mm and -next trees for a while.

These patches will be sent to the linux driver project list for all to
see.

thanks,

greg k-h

--------------

 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |    4 ----
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c |    3 ---
 drivers/staging/gma500/Kconfig                     |    2 +-
 drivers/staging/intel_sst/intelmid_v1_control.c    |    1 +
 drivers/staging/intel_sst/intelmid_v2_control.c    |    1 +
 drivers/staging/olpc_dcon/olpc_dcon_xo_1.c         |    1 +
 drivers/staging/rts_pstor/debug.h                  |    2 +-
 drivers/staging/rts_pstor/ms.c                     |    1 +
 drivers/staging/rts_pstor/rtsx_chip.c              |    5 +++--
 drivers/staging/rts_pstor/rtsx_scsi.c              |    1 +
 drivers/staging/rts_pstor/sd.c                     |    4 ++--
 drivers/staging/rts_pstor/trace.h                  |    2 +-
 drivers/staging/rts_pstor/xd.c                     |    1 +
 drivers/staging/solo6x10/Kconfig                   |    1 +
 drivers/staging/usbip/vhci_hcd.c                   |    9 ++++-----
 drivers/staging/usbip/vhci_sysfs.c                 |    7 ++++---
 drivers/staging/wlan-ng/cfg80211.c                 |    2 +-
 17 files changed, 24 insertions(+), 23 deletions(-)

---------------

Harry Wei (1):
      staging: Remove a warning for drivers/staging/wlan-ng/cfg80211.c

Jeff Mahoney (5):
      staging: olpc: Add <linux/delay.h>
      staging: gma500: Depend on X86
      staging: rts_pstor: Add <linux/vmalloc.h>
      staging: rts_pstor: use #ifdef instead of #if
      staging: ft1000: Remove unnecessary EXPORT_SYMBOLs

Max Vozeler (1):
      staging: usbip: vhci: fix oops on subsequent attach

Peter Foley (1):
      staging: solo6x10: add select SND_PCM to fix build error

Randy Dunlap (1):
      staging: intel_sst: intelmid needs delay.h