Commit f988dac7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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/vt66*: kconfig, depends on WLAN
  Staging: batman-adv: introduce missing kfree
  Staging: batman-adv: Add Kconfig dependancies on PROC_FS and PACKET.
  Staging: panel: Adjust range for PANEL_KEYPAD in Kconfig
  Staging: panel: Fix compilation error with custom lcd charset
  Staging: ramzswap: remove ARM specific d-cache hack
  Staging: rtl8192x: fix printk formats
  Staging: wlan-ng: fix Correct size given to memset
  staging: rtl8192su: add USB VID/PID for HWNUm-300
  staging: fix rtl8192su compilation errors with mac80211
  staging: fix rtl8192e compilation errors with mac80211
  Staging: fix rtl8187se compilation errors with mac80211
  Staging: rtl8192su: fix test for negative error in rtl8192_rx_isr()
  Staging: comedi: jr3_pci: Don't ioremap too much space. Check result.
  Staging: comedi: removed "depricated" from COMEDI_CB_BLOCK
  Staging: comedi: usbdux.c: fix locking up of the driver when the comedi ringbuffer runs empty
  Staging: dst: remove from the tree
  Staging: sm7xx: add a new framebuffer driver
  Staging: batman: fix debug Kconfig option
parents 849254e9 b2cd4149

drivers/staging/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -87,8 +87,6 @@ source "drivers/staging/frontier/Kconfig" 


source "drivers/staging/dream/Kconfig"



source "drivers/staging/dst/Kconfig"



source "drivers/staging/pohmelfs/Kconfig"



source "drivers/staging/b3dfg/Kconfig"
@@ -145,5 +143,7 @@ source "drivers/staging/wavelan/Kconfig" 


source "drivers/staging/netwave/Kconfig"



source "drivers/staging/sm7xx/Kconfig"



endif # !STAGING_EXCLUDE_BUILD

endif # STAGING

drivers/staging/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ obj-$(CONFIG_RTL8192E) += rtl8192e/ 
obj-$(CONFIG_INPUT_MIMIO)	+= mimio/

obj-$(CONFIG_TRANZPORT)		+= frontier/

obj-$(CONFIG_DREAM)		+= dream/

obj-$(CONFIG_DST)		+= dst/

obj-$(CONFIG_POHMELFS)		+= pohmelfs/

obj-$(CONFIG_B3DFG)		+= b3dfg/

obj-$(CONFIG_IDE_PHISON)	+= phison/
@@ -53,3 +52,4 @@ obj-$(CONFIG_ARLAN) += arlan/ 
obj-$(CONFIG_WAVELAN)		+= wavelan/

obj-$(CONFIG_PCMCIA_WAVELAN)	+= wavelan/

obj-$(CONFIG_PCMCIA_NETWAVE)	+= netwave/

obj-$(CONFIG_FB_SM7XX)		+= sm7xx/

drivers/staging/batman-adv/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


config BATMAN_ADV

	tristate "B.A.T.M.A.N. Advanced Meshing Protocol"

	depends on PROC_FS && PACKET

        default n

	---help---

drivers/staging/batman-adv/send.c

+3 −1
Original line number Diff line number Diff line
@@ -363,8 +363,10 @@ void add_bcast_packet_to_list(unsigned char *packet_buff, int packet_len) 
		return;



	forw_packet->packet_buff = kmalloc(packet_len, GFP_ATOMIC);

	if (!forw_packet->packet_buff)

	if (!forw_packet->packet_buff) {

		kfree(forw_packet);

		return;

	}



	forw_packet->packet_len = packet_len;

	memcpy(forw_packet->packet_buff, packet_buff, forw_packet->packet_len);

drivers/staging/comedi/comedi.h

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ 


#define COMEDI_CB_EOS		1	/* end of scan */

#define COMEDI_CB_EOA		2	/* end of acquisition */

#define COMEDI_CB_BLOCK		4	/* DEPRECATED: convenient block size */

#define COMEDI_CB_BLOCK		4	/* data has arrived: wakes up read() / write() */

#define COMEDI_CB_EOBUF		8	/* DEPRECATED: end of buffer */

#define COMEDI_CB_ERROR		16	/* card error during acquisition */

#define COMEDI_CB_OVERFLOW	32	/* buffer overflow/underflow */

CRA Git | Maintained and supported by SUSTech CRA and CCSE