Commit 0e2f7b83 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: (235 commits)
  Staging: IIO: add selection of IIO_SW_RING to LIS3L02DQ as needed
  Staging: IIO: Add tsl2560-2 support to tsl2563 driver.
  Staging: IIO: Remove tsl2561 driver. Support merged with tsl2563.
  Staging: wlags49_h2: fix up signal levels
  + drivers-staging-wlags49_h2-remove-cvs-metadata.patch added to -mm tree
  Staging: samsung-laptop: add TODO file
  Staging: samsung-laptop: remove old kernel code
  Staging: add Samsung Laptop driver
  staging: batman-adv meshing protocol
  Staging: rtl8192u: depends on USB
  Staging: rtl8192u: remove dead code
  Staging: rtl8192u: remove bad whitespaces
  Staging: rtl8192u: make it compile
  Staging: Added Realtek rtl8192u driver to staging
  Staging: dream: add gpio and pmem support
  Staging: dream: add TODO file
  Staging: android: delete android drivers
  Staging: et131x: clean up the avail fields in the rx registers
  Staging: et131x: Clean up number fields
  Staging: et131x: kill RX_DMA_MAX_PKT_TIME
  ...
parents f58df54a 032fec31

drivers/staging/Kconfig

+12 −4
Original line number Original line Diff line number Diff line
@@ -65,8 +65,6 @@ source "drivers/staging/rt2860/Kconfig" 




source "drivers/staging/rt2870/Kconfig"

source "drivers/staging/rt2870/Kconfig"





source "drivers/staging/rt3090/Kconfig"



source "drivers/staging/comedi/Kconfig"

source "drivers/staging/comedi/Kconfig"





source "drivers/staging/asus_oled/Kconfig"

source "drivers/staging/asus_oled/Kconfig"
@@ -79,14 +77,14 @@ source "drivers/staging/rtl8187se/Kconfig" 




source "drivers/staging/rtl8192su/Kconfig"

source "drivers/staging/rtl8192su/Kconfig"





source "drivers/staging/rtl8192u/Kconfig"



source "drivers/staging/rtl8192e/Kconfig"

source "drivers/staging/rtl8192e/Kconfig"





source "drivers/staging/mimio/Kconfig"

source "drivers/staging/mimio/Kconfig"





source "drivers/staging/frontier/Kconfig"

source "drivers/staging/frontier/Kconfig"





source "drivers/staging/android/Kconfig"



source "drivers/staging/dream/Kconfig"

source "drivers/staging/dream/Kconfig"





source "drivers/staging/dst/Kconfig"

source "drivers/staging/dst/Kconfig"
@@ -127,6 +125,16 @@ source "drivers/staging/sep/Kconfig" 




source "drivers/staging/iio/Kconfig"

source "drivers/staging/iio/Kconfig"





source "drivers/staging/ramzswap/Kconfig"



source "drivers/staging/wlags49_h2/Kconfig"



source "drivers/staging/wlags49_h25/Kconfig"



source "drivers/staging/batman-adv/Kconfig"



source "drivers/staging/samsung-laptop/Kconfig"



source "drivers/staging/strip/Kconfig"

source "drivers/staging/strip/Kconfig"





source "drivers/staging/arlan/Kconfig"

source "drivers/staging/arlan/Kconfig"

drivers/staging/Makefile

+8 −4
Original line number Original line Diff line number Diff line
@@ -15,18 +15,17 @@ obj-$(CONFIG_POCH) += poch/ 
obj-$(CONFIG_OTUS)		+= otus/

obj-$(CONFIG_OTUS)		+= otus/

obj-$(CONFIG_RT2860)		+= rt2860/

obj-$(CONFIG_RT2860)		+= rt2860/

obj-$(CONFIG_RT2870)		+= rt2870/

obj-$(CONFIG_RT2870)		+= rt2870/

obj-$(CONFIG_RT3090)		+= rt3090/

obj-$(CONFIG_COMEDI)		+= comedi/

obj-$(CONFIG_COMEDI)		+= comedi/

obj-$(CONFIG_ASUS_OLED)		+= asus_oled/

obj-$(CONFIG_ASUS_OLED)		+= asus_oled/

obj-$(CONFIG_PANEL)		+= panel/

obj-$(CONFIG_PANEL)		+= panel/

obj-$(CONFIG_ALTERA_PCIE_CHDMA)	+= altpciechdma/

obj-$(CONFIG_ALTERA_PCIE_CHDMA)	+= altpciechdma/

obj-$(CONFIG_RTL8187SE)		+= rtl8187se/

obj-$(CONFIG_R8187SE)		+= rtl8187se/

obj-$(CONFIG_RTL8192SU)		+= rtl8192su/

obj-$(CONFIG_RTL8192SU)		+= rtl8192su/

obj-$(CONFIG_RTL8192U)		+= rtl8192u/

obj-$(CONFIG_RTL8192E)		+= rtl8192e/

obj-$(CONFIG_RTL8192E)		+= rtl8192e/

obj-$(CONFIG_INPUT_MIMIO)	+= mimio/

obj-$(CONFIG_INPUT_MIMIO)	+= mimio/

obj-$(CONFIG_TRANZPORT)		+= frontier/

obj-$(CONFIG_TRANZPORT)		+= frontier/

obj-$(CONFIG_ANDROID)		+= android/

obj-$(CONFIG_DREAM)		+= dream/

obj-$(CONFIG_ANDROID)		+= dream/

obj-$(CONFIG_DST)		+= dst/

obj-$(CONFIG_DST)		+= dst/

obj-$(CONFIG_POHMELFS)		+= pohmelfs/

obj-$(CONFIG_POHMELFS)		+= pohmelfs/

obj-$(CONFIG_B3DFG)		+= b3dfg/

obj-$(CONFIG_B3DFG)		+= b3dfg/
@@ -44,6 +43,11 @@ obj-$(CONFIG_VME_BUS) += vme/ 
obj-$(CONFIG_RAR_REGISTER)	+= rar/

obj-$(CONFIG_RAR_REGISTER)	+= rar/

obj-$(CONFIG_DX_SEP)		+= sep/

obj-$(CONFIG_DX_SEP)		+= sep/

obj-$(CONFIG_IIO)		+= iio/

obj-$(CONFIG_IIO)		+= iio/

obj-$(CONFIG_RAMZSWAP)		+= ramzswap/

obj-$(CONFIG_WLAGS49_H2)	+= wlags49_h2/

obj-$(CONFIG_WLAGS49_H25)	+= wlags49_h25/

obj-$(CONFIG_BATMAN_ADV)	+= batman-adv/

obj-$(CONFIG_SAMSUNG_LAPTOP)	+= samsung-laptop/

obj-$(CONFIG_STRIP)		+= strip/

obj-$(CONFIG_STRIP)		+= strip/

obj-$(CONFIG_ARLAN)		+= arlan/

obj-$(CONFIG_ARLAN)		+= arlan/

obj-$(CONFIG_WAVELAN)		+= wavelan/

obj-$(CONFIG_WAVELAN)		+= wavelan/

drivers/staging/altpciechdma/altpciechdma.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -212,7 +212,7 @@ struct ape_dev { 
	int msi_enabled;

	int msi_enabled;

	/* whether this driver could obtain the regions */

	/* whether this driver could obtain the regions */

	int got_regions;

	int got_regions;

	/* irq line succesfully requested by this driver, -1 otherwise */

	/* irq line successfully requested by this driver, -1 otherwise */

	int irq_line;

	int irq_line;

	/* board revision */

	/* board revision */

	u8 revision;

	u8 revision;
@@ -336,7 +336,7 @@ static int __devinit map_bars(struct ape_dev *ape, struct pci_dev *dev) 
		printk(KERN_DEBUG "BAR[%d] mapped at 0x%p with length %lu(/%lu).\n", i,

		printk(KERN_DEBUG "BAR[%d] mapped at 0x%p with length %lu(/%lu).\n", i,

		ape->bar[i], bar_min_len[i], bar_length);

		ape->bar[i], bar_min_len[i], bar_length);

	}

	}

	/* succesfully mapped all required BAR regions */

	/* successfully mapped all required BAR regions */

	rc = 0;

	rc = 0;

	goto success;

	goto success;

fail:

fail:
@@ -911,7 +911,7 @@ static int __devinit probe(struct pci_dev *dev, const struct pci_device_id *id) 
	/* perform DMA engines loop back test */

	/* perform DMA engines loop back test */

	rc = dma_test(ape, dev);

	rc = dma_test(ape, dev);

	(void)rc;

	(void)rc;

	/* succesfully took the device */

	/* successfully took the device */

	rc = 0;

	rc = 0;

	printk(KERN_DEBUG "probe() successful.\n");

	printk(KERN_DEBUG "probe() successful.\n");

	goto end;

	goto end;

drivers/staging/android/Kconfig

deleted100644 → 0
+0 −96
Original line number Original line Diff line number Diff line 
menu "Android"



config ANDROID

	bool "Android Drivers"

	depends on BROKEN

	default N

	---help---

	  Enable support for various drivers needed on the Android platform



if ANDROID



config ANDROID_BINDER_IPC

	bool "Android Binder IPC Driver"

	default n



config ANDROID_LOGGER

	tristate "Android log driver"

	default n



config ANDROID_RAM_CONSOLE

	bool "Android RAM buffer console"

	default n



config ANDROID_RAM_CONSOLE_ENABLE_VERBOSE

	bool "Enable verbose console messages on Android RAM console"

	default y

	depends on ANDROID_RAM_CONSOLE



menuconfig ANDROID_RAM_CONSOLE_ERROR_CORRECTION

	bool "Android RAM Console Enable error correction"

	default n

	depends on ANDROID_RAM_CONSOLE

	depends on !ANDROID_RAM_CONSOLE_EARLY_INIT

	select REED_SOLOMON

	select REED_SOLOMON_ENC8

	select REED_SOLOMON_DEC8



if ANDROID_RAM_CONSOLE_ERROR_CORRECTION



config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_DATA_SIZE

	int "Android RAM Console Data data size"

	default 128

	help

	  Must be a power of 2.



config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_ECC_SIZE

	int "Android RAM Console ECC size"

	default 16



config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE

	int "Android RAM Console Symbol size"

	default 8



config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL

	hex "Android RAM Console Polynomial"

	default 0x19 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 4)

	default 0x29 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 5)

	default 0x61 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 6)

	default 0x89 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 7)

	default 0x11d if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 8)



endif # ANDROID_RAM_CONSOLE_ERROR_CORRECTION



config ANDROID_RAM_CONSOLE_EARLY_INIT

	bool "Start Android RAM console early"

	default n

	depends on ANDROID_RAM_CONSOLE



config ANDROID_RAM_CONSOLE_EARLY_ADDR

	hex "Android RAM console virtual address"

	default 0

	depends on ANDROID_RAM_CONSOLE_EARLY_INIT



config ANDROID_RAM_CONSOLE_EARLY_SIZE

	hex "Android RAM console buffer size"

	default 0

	depends on ANDROID_RAM_CONSOLE_EARLY_INIT



config ANDROID_TIMED_OUTPUT

	bool "Timed output class driver"

	default y



config ANDROID_TIMED_GPIO

	tristate "Android timed gpio driver"

	depends on GENERIC_GPIO && ANDROID_TIMED_OUTPUT

	default n



config ANDROID_LOW_MEMORY_KILLER

	bool "Android Low Memory Killer"

	default N

	---help---

	  Register processes to be killed when memory is low



endif # if ANDROID



endmenu

drivers/staging/android/Makefile

deleted100644 → 0
+0 −6
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o

obj-$(CONFIG_ANDROID_LOGGER)		+= logger.o

obj-$(CONFIG_ANDROID_RAM_CONSOLE)	+= ram_console.o

obj-$(CONFIG_ANDROID_TIMED_OUTPUT)	+= timed_output.o

obj-$(CONFIG_ANDROID_TIMED_GPIO)	+= timed_gpio.o

obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)	+= lowmemorykiller.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE