Commit 7ea61767 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: (641 commits)
  Staging: remove sxg driver
  Staging: remove heci driver
  Staging: remove at76_usb wireless driver.
  Staging: rspiusb: remove the driver
  Staging: meilhaus: remove the drivers
  Staging: remove me4000 driver.
  Staging: line6: ffzb returns an unsigned integer
  Staging: line6: pod.c: style cleanups
  Staging: iio: introduce missing kfree
  Staging: dream: introduce missing kfree
  Staging: comedi: addi-data: NULL dereference of amcc in v_pci_card_list_init()
  Staging: vt665x: fix built-in compiling
  Staging: rt3090: enable NATIVE_WPA_SUPPLICANT_SUPPORT option
  Staging: rt3090: port changes in WPA_MIX_PAIR_CIPHER to rt3090
  Staging: rt3090: rename device from raX to wlanX
  Staging: rt3090: remove possible conflict with rt2860
  Staging: rt2860/rt2870/rt3070/rt3090: fix compiler warning on x86_64
  Staging: rt2860: add new device ids
  Staging: rt3090: add device id 1462:891a
  Staging: asus_oled: Cleaned up checkpatch issues.
  ...
parents 0950efd1 e9d59922

drivers/staging/Kconfig

+20 −16
Original line number Diff line number Diff line
@@ -45,12 +45,6 @@ source "drivers/staging/et131x/Kconfig" 


source "drivers/staging/slicoss/Kconfig"



source "drivers/staging/sxg/Kconfig"



source "drivers/staging/me4000/Kconfig"



source "drivers/staging/meilhaus/Kconfig"



source "drivers/staging/go7007/Kconfig"



source "drivers/staging/usbip/Kconfig"
@@ -61,8 +55,6 @@ source "drivers/staging/wlan-ng/Kconfig" 


source "drivers/staging/echo/Kconfig"



source "drivers/staging/at76_usb/Kconfig"



source "drivers/staging/poch/Kconfig"



source "drivers/staging/agnx/Kconfig"
@@ -73,7 +65,7 @@ source "drivers/staging/rt2860/Kconfig" 


source "drivers/staging/rt2870/Kconfig"



source "drivers/staging/rt3070/Kconfig"

source "drivers/staging/rt3090/Kconfig"



source "drivers/staging/comedi/Kconfig"
@@ -87,16 +79,16 @@ source "drivers/staging/rtl8187se/Kconfig" 


source "drivers/staging/rtl8192su/Kconfig"



source "drivers/staging/rspiusb/Kconfig"

source "drivers/staging/rtl8192e/Kconfig"



source "drivers/staging/mimio/Kconfig"



source "drivers/staging/frontier/Kconfig"



source "drivers/staging/epl/Kconfig"



source "drivers/staging/android/Kconfig"



source "drivers/staging/dream/Kconfig"



source "drivers/staging/dst/Kconfig"



source "drivers/staging/pohmelfs/Kconfig"
@@ -109,8 +101,6 @@ source "drivers/staging/phison/Kconfig" 


source "drivers/staging/p9auth/Kconfig"



source "drivers/staging/heci/Kconfig"



source "drivers/staging/line6/Kconfig"



source "drivers/gpu/drm/radeon/Kconfig"
@@ -119,13 +109,27 @@ source "drivers/staging/octeon/Kconfig" 


source "drivers/staging/serqt_usb2/Kconfig"



source "drivers/staging/quatech_usb2/Kconfig"



source "drivers/staging/vt6655/Kconfig"



source "drivers/staging/cpc-usb/Kconfig"

source "drivers/staging/vt6656/Kconfig"



source "drivers/staging/pata_rdc/Kconfig"

source "drivers/staging/cpc-usb/Kconfig"



source "drivers/staging/udlfb/Kconfig"



source "drivers/staging/hv/Kconfig"



source "drivers/staging/vme/Kconfig"



source "drivers/staging/rar/Kconfig"



source "drivers/staging/sep/Kconfig"



source "drivers/staging/iio/Kconfig"



source "drivers/staging/cowloop/Kconfig"



endif # !STAGING_EXCLUDE_BUILD

endif # STAGING

drivers/staging/Makefile

+11 −9
Original line number Diff line number Diff line
@@ -5,43 +5,45 @@ obj-$(CONFIG_STAGING) += staging.o 


obj-$(CONFIG_ET131X)		+= et131x/

obj-$(CONFIG_SLICOSS)		+= slicoss/

obj-$(CONFIG_SXG)		+= sxg/

obj-$(CONFIG_ME4000)		+= me4000/

obj-$(CONFIG_MEILHAUS)		+= meilhaus/

obj-$(CONFIG_VIDEO_GO7007)	+= go7007/

obj-$(CONFIG_USB_IP_COMMON)	+= usbip/

obj-$(CONFIG_W35UND)		+= winbond/

obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/

obj-$(CONFIG_ECHO)		+= echo/

obj-$(CONFIG_USB_ATMEL)		+= at76_usb/

obj-$(CONFIG_POCH)		+= poch/

obj-$(CONFIG_AGNX)		+= agnx/

obj-$(CONFIG_OTUS)		+= otus/

obj-$(CONFIG_RT2860)		+= rt2860/

obj-$(CONFIG_RT2870)		+= rt2870/

obj-$(CONFIG_RT3070)		+= rt3070/

obj-$(CONFIG_RT3090)		+= rt3090/

obj-$(CONFIG_COMEDI)		+= comedi/

obj-$(CONFIG_ASUS_OLED)		+= asus_oled/

obj-$(CONFIG_PANEL)		+= panel/

obj-$(CONFIG_ALTERA_PCIE_CHDMA)	+= altpciechdma/

obj-$(CONFIG_RTL8187SE)		+= rtl8187se/

obj-$(CONFIG_RTL8192SU)		+= rtl8192su/

obj-$(CONFIG_USB_RSPI)		+= rspiusb/

obj-$(CONFIG_RTL8192E)		+= rtl8192e/

obj-$(CONFIG_INPUT_MIMIO)	+= mimio/

obj-$(CONFIG_TRANZPORT)		+= frontier/

obj-$(CONFIG_EPL)		+= epl/

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/

obj-$(CONFIG_HECI)		+= heci/

obj-$(CONFIG_LINE6_USB)		+= line6/

obj-$(CONFIG_USB_SERIAL_QUATECH2)	+= serqt_usb2/

obj-$(CONFIG_USB_SERIAL_QUATECH_USB2)	+= quatech_usb2/

obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/

obj-$(CONFIG_VT6655)		+= vt6655/

obj-$(CONFIG_VT6656)		+= vt6656/

obj-$(CONFIG_USB_CPC)		+= cpc-usb/

obj-$(CONFIG_RDC_17F3101X)	+= pata_rdc/

obj-$(CONFIG_FB_UDL)		+= udlfb/

obj-$(CONFIG_HYPERV)		+= hv/

obj-$(CONFIG_VME_BUS)		+= vme/

obj-$(CONFIG_RAR_REGISTER)	+= rar/

obj-$(CONFIG_DX_SEP)		+= sep/

obj-$(CONFIG_IIO)		+= iio/

obj-$(CONFIG_COWLOOP)		+= cowloop/

drivers/staging/agnx/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static void agnx_stop(struct ieee80211_hw *dev) 
	/* make sure hardware will not generate irq */

	agnx_hw_reset(priv);

	free_irq(priv->pdev->irq, dev);

	flush_workqueue(priv->hw->workqueue);

/*	flush_workqueue(priv->hw->workqueue); */

/*	cancel_delayed_work_sync(&priv->periodic_work); */

	unfill_rings(priv);

	rings_free(priv);

drivers/staging/altpciechdma/altpciechdma.c

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ static int __devinit dma_test(struct ape_dev *ape, struct pci_dev *dev) 
#if 0

		*(u32 *)(buffer_virt + i) = i / PAGE_SIZE + 1;

#else

		*(u32 *)(buffer_virt + i) = (buffer_virt + i);

		*(u32 *)(buffer_virt + i) = (u32)(unsigned long)(buffer_virt + i);

#endif

#if 0

  compare((u32 *)buffer_virt, (u32 *)(buffer_virt + 2 * PAGE_SIZE), 8192);

drivers/staging/android/binder.c

+375 −338

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE