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: (714 commits)
  Staging: sxg: slicoss: Specify the license for Sahara SXG and Slicoss drivers
  Staging: serqt_usb: fix build due to proc tty changes
  Staging: serqt_usb: fix checkpatch errors
  Staging: serqt_usb: add TODO file
  Staging: serqt_usb: Lindent the code
  Staging: add USB serial Quatech driver
  staging: document that the wifi staging drivers a bit better
  Staging: echo cleanup
  Staging: BUG to BUG_ON changes
  Staging: remove some pointless conditionals before kfree_skb()
  Staging: line6: fix build error, select SND_RAWMIDI
  Staging: line6: fix checkpatch errors in variax.c
  Staging: line6: fix checkpatch errors in toneport.c
  Staging: line6: fix checkpatch errors in pcm.c
  Staging: line6: fix checkpatch errors in midibuf.c
  Staging: line6: fix checkpatch errors in midi.c
  Staging: line6: fix checkpatch errors in dumprequest.c
  Staging: line6: fix checkpatch errors in driver.c
  Staging: line6: fix checkpatch errors in audio.c
  Staging: line6: fix checkpatch errors in pod.c
  ...

diff --combined drivers/staging/Kconfig
index 92981c2383ee54680a0d5f2a78900b99b6fc9f22,7ea9d918387f5699ebe87e696c23d1a08195aacc..0dcf9ca0b0ac758786299a99ea412c8ba1245529
--- 1/drivers/staging/Kconfig
--- 2/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -4,7 -4,7 +4,7 @@@ menuconfig STAGIN
        ---help---
          This option allows you to select a number of drivers that are
          not of the "normal" Linux kernel quality level.  These drivers
 -        are placed here in order to get a wider audience for use of
 +        are placed here in order to get a wider audience to make use of
          them.  Please note that these drivers are under heavy
          development, may or may not work, and may contain userspace
          interfaces that most likely will be changed in the near
@@@ -12,7 -12,7 +12,7 @@@
  
          Using any of these drivers will taint your kernel which might
          affect support options from both the community, and various
 -        commercial support orginizations.
 +        commercial support organizations.
  
          If you wish to work on these drivers, to help improve them, or
          to report problems you have with them, please see the
@@@ -73,6 -73,8 +73,8 @@@ source "drivers/staging/rt2860/Kconfig
  
  source "drivers/staging/rt2870/Kconfig"
  
+ source "drivers/staging/rt3070/Kconfig"
+ 
  source "drivers/staging/comedi/Kconfig"
  
  source "drivers/staging/asus_oled/Kconfig"
@@@ -93,5 -95,25 +95,25 @@@ source "drivers/staging/epl/Kconfig
  
  source "drivers/staging/android/Kconfig"
  
+ source "drivers/staging/dst/Kconfig"
+ 
+ source "drivers/staging/pohmelfs/Kconfig"
+ 
+ source "drivers/staging/stlc45xx/Kconfig"
+ 
+ source "drivers/staging/uc2322/Kconfig"
+ 
+ source "drivers/staging/b3dfg/Kconfig"
+ 
+ source "drivers/staging/phison/Kconfig"
+ 
+ source "drivers/staging/p9auth/Kconfig"
+ 
+ source "drivers/staging/heci/Kconfig"
+ 
+ source "drivers/staging/line6/Kconfig"
+ 
+ source "drivers/staging/serqt_usb/Kconfig"
+ 
  endif # !STAGING_EXCLUDE_BUILD
  endif # STAGING

diff --combined drivers/staging/comedi/Kconfig
index 83a93a5c63926593a829585b8b46e735fd912f6a,6365a2023d524a363bab79742517eb3ccd352943..2d819d278b0ece94afad8f71be331180bbcd1bfb
--- 1/drivers/staging/comedi/Kconfig
--- 2/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@@ -1,11 -1,18 +1,18 @@@
  config COMEDI
 -      tristate "Data Acquision support (comedi)"
 +      tristate "Data acquisition support (comedi)"
        default N
        depends on m
        ---help---
 -        Enable support a wide range of data acquision devices
 +        Enable support a wide range of data acquisition devices
          for Linux.
  
+ config COMEDI_DEBUG
+       bool "Comedi debugging"
+       depends on COMEDI != n
+       help
+         This is an option for use by developers; most people should
+         say N here. This enables comedi core and driver debugging.
+ 
  config COMEDI_RT
        tristate "Comedi Real-time support"
        depends on COMEDI && RT
@@@ -20,6 -27,13 +27,13 @@@ config COMEDI_PCI_DRIVER
        ---help---
          Enable lots of comedi PCI drivers to be built
  
+ config COMEDI_PCMCIA_DRIVERS
+       tristate "Comedi PCMCIA drivers"
+       depends on COMEDI && PCMCIAI
+       default N
+       ---help---
+         Enable lots of comedi PCMCIA drivers to be built
+ 
  config COMEDI_USB_DRIVERS
        tristate "Comedi USB drivers"
        depends on COMEDI && USB

diff --combined drivers/staging/otus/hal/hpmain.c
index dab278326931bbee68b821265227ecbc2f821a2e,72c9e89979c9823185efd4eafcefe98bb672b8e1..322585be2c88099f54bff1b6ef211a60365026e1
--- 1/drivers/staging/otus/hal/hpmain.c
--- 2/drivers/staging/otus/hal/hpmain.c
+++ b/drivers/staging/otus/hal/hpmain.c
@@@ -152,7 -152,7 +152,7 @@@ u16_t zfHpInit(zdev_t* dev, u32_t frequ
      else
      {
      #ifndef ZM_OTUS_LINUX_PHASE_2
 -        /* donwload the normal frimware */
 +        /* download the normal firmware */
          if ((ret = zfFirmwareDownload(dev, (u32_t*)zcFwImage,
                  (u32_t)zcFwImageSize, ZM_FIRMWARE_WLAN_ADDR)) != ZM_SUCCESS)
          {
@@@ -328,8 -328,8 +328,8 @@@ void zfInitPhy(zdev_t* dev,  u32_t freq
      u16_t modesIndex = 0;
      u16_t freqIndex = 0;
      u32_t tmp, tmp1;
-     zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv=wd->hpPrivate;
+     struct zsHpPriv* hpPriv;
+ 
      u32_t eepromBoardData[15][6] = {
      /* Register   A-20        A-20/40     G-20/40     G-20        G-Turbo    */
          {0x9964,    0,      0,      0,      0,      0},
@@@ -349,6 -349,9 +349,9 @@@
          {0xa258,    0,      0,      0,      0,      0},
      };
  
+     zmw_get_wlan_dev(dev);
+     hpPriv=wd->hpPrivate;
+ 
      /* #1 Save the initial value of the related RIFS register settings */
      //((struct zsHpPriv*)wd->hpPrivate)->isInitialPhy++;
  
@@@ -1324,9 -1327,10 +1327,10 @@@ void zfHpSetFrequencyEx(zdev_t* dev, u3
      int delta_slope_coeff_man;
      int delta_slope_coeff_exp_shgi;
      int delta_slope_coeff_man_shgi;
+     struct zsHpPriv* hpPriv;
  
      zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv = wd->hpPrivate;
+     hpPriv = wd->hpPrivate;
  
      zm_msg1_scan(ZM_LV_1, "Frequency = ", frequency);
      zm_msg1_scan(ZM_LV_1, "bw40 = ", bw40);
@@@ -1560,9 -1564,10 +1564,10 @@@ u16_t zfHpResetKeyCache(zdev_t* dev
  {
      u8_t i;
      u32_t key[4] = {0, 0, 0, 0};
+     struct zsHpPriv* hpPriv;
  
      zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv=wd->hpPrivate;
+     hpPriv=wd->hpPrivate;
  
      for(i=0;i<4;i++)
      {
@@@ -1601,9 -1606,10 +1606,10 @@@ u32_t zfHpSetKey(zdev_t* dev, u8_t user
      u32_t cmd[(ZM_MAX_CMD_SIZE/4)];
      u16_t ret;
      u16_t i;
+     struct zsHpPriv* hpPriv;
  
      zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv=wd->hpPrivate;
+     hpPriv=wd->hpPrivate;
  
  #if 0   /* remove to zfCoreSetKey() */
      zmw_declare_for_critical_section();
@@@ -1670,8 -1676,10 +1676,10 @@@ u32_t zfHpSetDefaultKey(zdev_t* dev, u8
      u16_t macAddr[3] = {0, 0, 0};
  
      #ifdef ZM_ENABLE_IBSS_WPA2PSK
+     struct zsHpPriv* hpPriv;
+ 
      zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv = wd->hpPrivate;
+     hpPriv = wd->hpPrivate;
  
      if ( hpPriv->dot11Mode == ZM_HAL_80211_MODE_IBSS_WPA2PSK )
      { /* If not wpa2psk , use traditional */
@@@ -1702,8 -1710,10 +1710,10 @@@
  u32_t zfHpSetPerUserKey(zdev_t* dev, u8_t user, u8_t keyId, u8_t* mac, u8_t type, u32_t* key, u32_t* micKey)
  {
  #ifdef ZM_ENABLE_IBSS_WPA2PSK
+     struct zsHpPriv* hpPriv;
+ 
      zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv = wd->hpPrivate;
+     hpPriv = wd->hpPrivate;
  
      if ( hpPriv->dot11Mode == ZM_HAL_80211_MODE_IBSS_WPA2PSK )
      { /* If not wpa2psk , use traditional */
@@@ -1918,9 -1928,10 +1928,10 @@@ u16_t zfHpSetSnifferMode(zdev_t* dev, u
  
  u16_t zfHpSetApStaMode(zdev_t* dev, u8_t mode)
  {
-     zmw_get_wlan_dev(dev);
+     struct zsHpPriv* hpPriv;
  
-     struct zsHpPriv* hpPriv = wd->hpPrivate;
+     zmw_get_wlan_dev(dev);
+     hpPriv = wd->hpPrivate;
      hpPriv->dot11Mode = mode;
  
      switch(mode)
@@@ -1993,8 -2004,10 +2004,10 @@@ u16_t zfHpSetBssid(zdev_t* dev, u8_t* b
  u8_t zfHpUpdateQosParameter(zdev_t* dev, u16_t* cwminTbl, u16_t* cwmaxTbl,
          u16_t* aifsTbl, u16_t* txopTbl)
  {
+     struct zsHpPriv* hpPriv;
+ 
      zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv = wd->hpPrivate;
+     hpPriv = wd->hpPrivate;
  
      zm_msg0_mm(ZM_LV_0, "zfHalUpdateQosParameter()");
  
@@@ -2259,9 -2272,11 +2272,11 @@@ u32_t zfHpCwmUpdate(zdev_t* dev
      //
      //ret = zfIssueCmd(dev, cmd, 12, ZM_CWM_READ, 0);
      //return ret;
-     zmw_get_wlan_dev(dev);
  
-     struct zsHpPriv* hpPriv=wd->hpPrivate;
+     struct zsHpPriv* hpPriv;
+ 
+     zmw_get_wlan_dev(dev);
+     hpPriv=wd->hpPrivate;
  
      zfCoreCwmBusy(dev, zfCwmIsExtChanBusy(hpPriv->ctlBusy, hpPriv->extBusy));
  
@@@ -2291,9 -2306,10 +2306,10 @@@ u32_t zfHpAniUpdate(zdev_t* dev
   */
  u32_t zfHpAniUpdateRssi(zdev_t* dev, u8_t rssi)
  {
-     zmw_get_wlan_dev(dev);
+     struct zsHpPriv* hpPriv;
  
-     struct zsHpPriv* hpPriv=wd->hpPrivate;
+     zmw_get_wlan_dev(dev);
+     hpPriv=wd->hpPrivate;
  
      hpPriv->stats.ast_nodestats.ns_avgbrssi = rssi;
  
@@@ -2325,11 -2341,12 +2341,12 @@@ u32_t zfHpGetMacAddress(zdev_t* dev
  
  u32_t zfHpGetTransmitPower(zdev_t* dev)
  {
-     zmw_get_wlan_dev(dev);
- 
-     struct zsHpPriv*    hpPriv  = wd->hpPrivate;
+     struct zsHpPriv*    hpPriv;
      u16_t               tpc     = 0;
  
+     zmw_get_wlan_dev(dev);
+     hpPriv  = wd->hpPrivate;
+ 
      if (hpPriv->hwFrequency < 3000) {
          tpc = hpPriv->tPow2x2g[0] & 0x3f;
          wd->maxTxPower2 &= 0x3f;
@@@ -2345,11 -2362,12 +2362,12 @@@
  
  u8_t zfHpGetMinTxPower(zdev_t* dev)
  {
-     zmw_get_wlan_dev(dev);
- 
-     struct zsHpPriv*    hpPriv  = wd->hpPrivate;
+     struct zsHpPriv*    hpPriv;
      u8_t               tpc     = 0;
  
+     zmw_get_wlan_dev(dev);
+     hpPriv  = wd->hpPrivate;
+ 
      if (hpPriv->hwFrequency < 3000)
      {
          if(wd->BandWidth40)
@@@ -2382,11 -2400,12 +2400,12 @@@
  
  u8_t zfHpGetMaxTxPower(zdev_t* dev)
  {
-     zmw_get_wlan_dev(dev);
- 
-     struct zsHpPriv*    hpPriv  = wd->hpPrivate;
+     struct zsHpPriv*    hpPriv;
      u8_t               tpc     = 0;
  
+     zmw_get_wlan_dev(dev);
+     hpPriv  = wd->hpPrivate;
+ 
      if (hpPriv->hwFrequency < 3000)
      {
          tpc = (hpPriv->tPow2xCck[0]&0x3f);
@@@ -2421,11 -2440,13 +2440,13 @@@ u32_t zfHpLoadEEPROMFromFW(zdev_t* dev
  
  void zfHpHeartBeat(zdev_t* dev)
  {
-     zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv=wd->hpPrivate;
+     struct zsHpPriv* hpPriv;
      u8_t polluted = 0;
      u8_t ackTpc;
  
+     zmw_get_wlan_dev(dev);
+     hpPriv=wd->hpPrivate;
+ 
      /* Workaround : Make OTUS fire more beacon in ad hoc mode in 2.4GHz */
      if (hpPriv->ibssBcnEnabled != 0)
      {
@@@ -4219,8 -4240,10 +4240,10 @@@ void zfHpPowerSaveSetMode(zdev_t* dev, 
  
  void zfHpPowerSaveSetState(zdev_t* dev, u8_t psState)
  {
+     struct zsHpPriv* hpPriv;
+ 
      zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv = wd->hpPrivate;
+     hpPriv = wd->hpPrivate;
  
        //DbgPrint("INTO zfHpPowerSaveSetState");
  
@@@ -4279,8 -4302,10 +4302,10 @@@
  
  void zfHpSetAggPktNum(zdev_t* dev, u32_t num)
  {
+     struct zsHpPriv* hpPriv;
+ 
      zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv = wd->hpPrivate;
+     hpPriv = wd->hpPrivate;
  
      num = (num << 16) | (0xa);
  
@@@ -4310,8 -4335,10 +4335,10 @@@ void zfHpSetMPDUDensity(zdev_t* dev, u8
  
  void zfHpSetSlotTime(zdev_t* dev, u8_t type)
  {
+     struct zsHpPriv* hpPriv;
+ 
      zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv = wd->hpPrivate;
+     hpPriv = wd->hpPrivate;
  
      if (type == 0)
      {
@@@ -4376,8 -4403,10 +4403,10 @@@ void zfHpSetRifs(zdev_t* dev, u8_t ht_e
  
  void zfHpBeginSiteSurvey(zdev_t* dev, u8_t status)
  {
+     struct zsHpPriv* hpPriv;
+ 
      zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv=wd->hpPrivate;
+     hpPriv=wd->hpPrivate;
  
      if ( status == 1 )
      { // Connected
@@@ -4421,8 -4450,10 +4450,10 @@@
  
  void zfHpFinishSiteSurvey(zdev_t* dev, u8_t status)
  {
+     struct zsHpPriv* hpPriv;
+ 
      zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv=wd->hpPrivate;
+     hpPriv=wd->hpPrivate;
  
      zmw_declare_for_critical_section();
  
@@@ -4527,16 -4558,20 +4558,20 @@@ void zfHpSWEncrypt(zdev_t* dev, u8_t en
  
  u32_t zfHpCapability(zdev_t* dev)
  {
+     struct zsHpPriv* hpPriv;
+ 
      zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv=wd->hpPrivate;
+     hpPriv=wd->hpPrivate;
  
      return hpPriv->halCapability;
  }
  
  void zfHpSetRollCallTable(zdev_t* dev)
  {
+     struct zsHpPriv* hpPriv;
+ 
      zmw_get_wlan_dev(dev);
-     struct zsHpPriv* hpPriv=wd->hpPrivate;
+     hpPriv=wd->hpPrivate;
  
      if (hpPriv->camRollCallTable != (u64_t) 0)
      {