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:
  Staging: fix wireless drivers depends
  Staging: wireless drivers Kconfig change
  Staging: android: mark subsystem as broken
  Staging: remove stlc45xx driver
  Staging: rtl8187se/rtl8192e/rtl8192su: allow module unload
  Staging: vt6656: fix the memory free bug in vntwusb_disconnect()
  Staging: Panel: prevent driver from calling misc_deregister twice on same ressource
  Staging: hv: fix oops in vmbus - missing #include
  Staging: hv: fix oops in vmbus - netvsc list_head
  Staging: hv: fix oops in vmbus - udev events
  Staging: hv: Fix vmbus load hang caused by faulty data packing
  Staging: hv: Fix null pointer error after vmbus loading
  Staging: hv TODO patches

36 files changed, 75 insertions, 3462 deletions

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 7df3ba4f1f4d..d21b3469f6d7 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -93,8 +93,6 @@ source "drivers/staging/dst/Kconfig"
 
 source "drivers/staging/pohmelfs/Kconfig"
 
-source "drivers/staging/stlc45xx/Kconfig"
-
 source "drivers/staging/b3dfg/Kconfig"
 
 source "drivers/staging/phison/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 747571172269..8cbf1aebea2e 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -29,7 +29,6 @@ obj-$(CONFIG_ANDROID)		+= android/
 obj-$(CONFIG_ANDROID)           += dream/
 obj-$(CONFIG_DST)               += dst/
 obj-$(CONFIG_POHMELFS)          += pohmelfs/
-obj-$(CONFIG_STLC45XX)          += stlc45xx/
 obj-$(CONFIG_B3DFG)             += b3dfg/
 obj-$(CONFIG_IDE_PHISON)        += phison/
 obj-$(CONFIG_PLAN9AUTH)         += p9auth/
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index 247194992374..eb675635ae60 100644
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -2,6 +2,7 @@ menu "Android"
 
 config ANDROID
         bool "Android Drivers"
+        depends on BROKEN
         default N
         ---help---
           Enable support for various drivers needed on the Android platform
diff --git a/drivers/staging/hv/ChannelMgmt.h b/drivers/staging/hv/ChannelMgmt.h
index a839d8fe6cec..fa973d86b624 100644
--- a/drivers/staging/hv/ChannelMgmt.h
+++ b/drivers/staging/hv/ChannelMgmt.h
@@ -26,6 +26,7 @@
 #define _CHANNEL_MGMT_H_
 
 #include <linux/list.h>
+#include <linux/timer.h>
 #include "RingBuffer.h"
 #include "VmbusChannelInterface.h"
 #include "VmbusPacketFormat.h"
@@ -54,7 +55,7 @@ enum vmbus_channel_message_type {
         ChannelMessageViewRangeRemove           = 18,
 #endif
         ChannelMessageCount
-} __attribute__((packed));
+};
 
 struct vmbus_channel_message_header {
         enum vmbus_channel_message_type MessageType;
diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c
index 1610b845198f..d384c0ddf069 100644
--- a/drivers/staging/hv/NetVsc.c
+++ b/drivers/staging/hv/NetVsc.c
@@ -1052,7 +1052,7 @@ static void NetVscOnReceive(struct hv_device *Device,
          */
         spin_lock_irqsave(&netDevice->receive_packet_list_lock, flags);
         while (!list_empty(&netDevice->ReceivePacketList)) {
-                list_move_tail(&netDevice->ReceivePacketList, &listHead);
+                list_move_tail(netDevice->ReceivePacketList.next, &listHead);
                 if (++count == vmxferpagePacket->RangeCount + 1)
                         break;
         }
@@ -1071,7 +1071,7 @@ static void NetVscOnReceive(struct hv_device *Device,
                 /* Return it to the freelist */
                 spin_lock_irqsave(&netDevice->receive_packet_list_lock, flags);
                 for (i = count; i != 0; i--) {
-                        list_move_tail(&listHead,
+                        list_move_tail(listHead.next,
                                        &netDevice->ReceivePacketList);
                 }
                 spin_unlock_irqrestore(&netDevice->receive_packet_list_lock,
@@ -1085,8 +1085,7 @@ static void NetVscOnReceive(struct hv_device *Device,
         }
 
         /* Remove the 1st packet to represent the xfer page packet itself */
-        xferpagePacket = list_entry(&listHead, struct xferpage_packet,
-                                    ListEntry);
+        xferpagePacket = (struct xferpage_packet*)listHead.next;
         list_del(&xferpagePacket->ListEntry);
 
         /* This is how much we can satisfy */
@@ -1102,8 +1101,7 @@ static void NetVscOnReceive(struct hv_device *Device,
 
         /* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */
         for (i = 0; i < (count - 1); i++) {
-                netvscPacket = list_entry(&listHead, struct hv_netvsc_packet,
-                                          ListEntry);
+                netvscPacket = (struct hv_netvsc_packet*)listHead.next;
                 list_del(&netvscPacket->ListEntry);
 
                 /* Initialize the netvsc packet */
diff --git a/drivers/staging/hv/TODO b/drivers/staging/hv/TODO
index 4d390b237742..dbfbde937a66 100644
--- a/drivers/staging/hv/TODO
+++ b/drivers/staging/hv/TODO
@@ -1,11 +1,17 @@
 TODO:
         - fix remaining checkpatch warnings and errors
+        - use of /** when it is not a kerneldoc header
         - remove RingBuffer.c to us in-kernel ringbuffer functions instead.
         - audit the vmbus to verify it is working properly with the
           driver model
+        - convert vmbus driver interface function pointer tables
+          to constant, a.k.a vmbus_ops
         - see if the vmbus can be merged with the other virtual busses
           in the kernel
         - audit the network driver