fb09bafda6
Here is the big staging tree pull request for the 3.5-rc1 merge window. Loads of changes here, and we just narrowly added more lines than we added: 622 files changed, 28356 insertions(+), 26059 deletions(-) But, good news is that there is a number of subsystems that moved out of the staging tree, to their respective "real" portions of the kernel. Code that moved out was: - iio core code - mei driver - vme core and bridge drivers There was one broken network driver that moved into staging as a step before it is removed from the tree (pc300), and there was a few new drivers added to the tree: - new iio drivers - gdm72xx wimax USB driver - ipack subsystem and 2 drivers All of the movements around have acks from the various subsystem maintainers, and all of this has been in the linux-next tree for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEABECAAYFAk+7q8MACgkQMUfUDdst+ymjogCguo8fANFVlPWeZGeoBTL+aQfQ yTkAoLE0codmh+2SvhulYgyU1Wh6ZDK2 =nJ2F -----END PGP SIGNATURE----- Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging tree changes from Greg Kroah-Hartman: "Here is the big staging tree pull request for the 3.5-rc1 merge window. Loads of changes here, and we just narrowly added more lines than we added: 622 files changed, 28356 insertions(+), 26059 deletions(-) But, good news is that there is a number of subsystems that moved out of the staging tree, to their respective "real" portions of the kernel. Code that moved out was: - iio core code - mei driver - vme core and bridge drivers There was one broken network driver that moved into staging as a step before it is removed from the tree (pc300), and there was a few new drivers added to the tree: - new iio drivers - gdm72xx wimax USB driver - ipack subsystem and 2 drivers All of the movements around have acks from the various subsystem maintainers, and all of this has been in the linux-next tree for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fixed up various trivial conflicts, along with a non-trivial one found in -next and pointed out by Olof Johanssen: a clean - but incorrect - merge of the arch/arm/boot/dts/at91sam9g20.dtsi file. Fix up manually as per Stephen Rothwell. * tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits) Staging: bcm: Remove two unused variables from Adapter.h Staging: bcm: Removes the volatile type definition from Adapter.h Staging: bcm: Rename all "INT" to "int" in Adapter.h Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h Staging: bcm: Correctly format all comments in Adapter.h Staging: bcm: Fix all whitespace issues in Adapter.h Staging: bcm: Properly format braces in Adapter.h Staging: ipack/bridges/tpci200: remove unneeded casts Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant Staging: ipack: remove board_name and bus_name fields from struct ipack_device Staging: ipack: improve the register of a bus and a device in the bus. staging: comedi: cleanup all the comedi_driver 'detach' functions staging: comedi: remove all 'default N' in Kconfig staging: line6/config.h: Delete unused header staging: gdm72xx depends on NET staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices staging: drm/omap: initial dmabuf/prime import support staging: drm/omap: dmabuf/prime mmap support pstore/ram: Add ECC support pstore/ram: Switch to persistent_ram routines ...
136 lines
3.1 KiB
Plaintext
136 lines
3.1 KiB
Plaintext
menuconfig STAGING
|
|
bool "Staging drivers"
|
|
default n
|
|
---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 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
|
|
future.
|
|
|
|
Using any of these drivers will taint your kernel which might
|
|
affect support options from both the community, and various
|
|
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
|
|
driver_name.README file in the drivers/staging/ directory to
|
|
see what needs to be worked on, and who to contact.
|
|
|
|
If in doubt, say N here.
|
|
|
|
|
|
if STAGING
|
|
|
|
source "drivers/staging/et131x/Kconfig"
|
|
|
|
source "drivers/staging/slicoss/Kconfig"
|
|
|
|
source "drivers/staging/usbip/Kconfig"
|
|
|
|
source "drivers/staging/winbond/Kconfig"
|
|
|
|
source "drivers/staging/wlan-ng/Kconfig"
|
|
|
|
source "drivers/staging/echo/Kconfig"
|
|
|
|
source "drivers/staging/comedi/Kconfig"
|
|
|
|
source "drivers/staging/olpc_dcon/Kconfig"
|
|
|
|
source "drivers/staging/asus_oled/Kconfig"
|
|
|
|
source "drivers/staging/panel/Kconfig"
|
|
|
|
source "drivers/staging/rtl8187se/Kconfig"
|
|
|
|
source "drivers/staging/rtl8192u/Kconfig"
|
|
|
|
source "drivers/staging/rtl8192e/Kconfig"
|
|
|
|
source "drivers/staging/rtl8712/Kconfig"
|
|
|
|
source "drivers/staging/rts_pstor/Kconfig"
|
|
|
|
source "drivers/staging/rts5139/Kconfig"
|
|
|
|
source "drivers/staging/frontier/Kconfig"
|
|
|
|
source "drivers/staging/phison/Kconfig"
|
|
|
|
source "drivers/staging/line6/Kconfig"
|
|
|
|
source "drivers/staging/octeon/Kconfig"
|
|
|
|
source "drivers/staging/serqt_usb2/Kconfig"
|
|
|
|
source "drivers/staging/vt6655/Kconfig"
|
|
|
|
source "drivers/staging/vt6656/Kconfig"
|
|
|
|
source "drivers/staging/sep/Kconfig"
|
|
|
|
source "drivers/staging/iio/Kconfig"
|
|
|
|
source "drivers/staging/zram/Kconfig"
|
|
|
|
source "drivers/staging/zcache/Kconfig"
|
|
|
|
source "drivers/staging/zsmalloc/Kconfig"
|
|
|
|
source "drivers/staging/wlags49_h2/Kconfig"
|
|
|
|
source "drivers/staging/wlags49_h25/Kconfig"
|
|
|
|
source "drivers/staging/sm7xx/Kconfig"
|
|
|
|
source "drivers/staging/crystalhd/Kconfig"
|
|
|
|
source "drivers/staging/cxt1e1/Kconfig"
|
|
|
|
source "drivers/staging/xgifb/Kconfig"
|
|
|
|
source "drivers/staging/tidspbridge/Kconfig"
|
|
|
|
source "drivers/staging/quickstart/Kconfig"
|
|
|
|
source "drivers/staging/sbe-2t3e3/Kconfig"
|
|
|
|
source "drivers/staging/keucr/Kconfig"
|
|
|
|
source "drivers/staging/bcm/Kconfig"
|
|
|
|
source "drivers/staging/ft1000/Kconfig"
|
|
|
|
source "drivers/staging/speakup/Kconfig"
|
|
|
|
source "drivers/staging/cptm1217/Kconfig"
|
|
|
|
source "drivers/staging/ste_rmi4/Kconfig"
|
|
|
|
source "drivers/staging/nvec/Kconfig"
|
|
|
|
source "drivers/staging/media/Kconfig"
|
|
|
|
source "drivers/staging/net/Kconfig"
|
|
|
|
source "drivers/staging/omapdrm/Kconfig"
|
|
|
|
source "drivers/staging/android/Kconfig"
|
|
|
|
source "drivers/staging/telephony/Kconfig"
|
|
|
|
source "drivers/staging/ramster/Kconfig"
|
|
|
|
source "drivers/staging/ozwpan/Kconfig"
|
|
|
|
source "drivers/staging/ccg/Kconfig"
|
|
|
|
source "drivers/staging/ipack/Kconfig"
|
|
|
|
source "drivers/staging/gdm72xx/Kconfig"
|
|
|
|
endif # STAGING
|