mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 12:43:55 +08:00
3498d13b80
As we skipped the merge window for 3.6-rc1 for the tty tree, everything is now settled down and working properly, so we are ready for 3.7-rc1. Here's the patchset, it's big, but the large changes are removing a firmware file and adding a staging tty driver (it depended on the tty core changes, so it's going through this tree instead of the staging tree.) All of these patches have 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.19 (GNU/Linux) iEYEABECAAYFAlBp36oACgkQMUfUDdst+yk4WgCdEy13hot8fI2Lqnc7W0LKu7GX 4p8AoLTjzrXhLosxdijskDQ9X1OtjrxU =S5Ng -----END PGP SIGNATURE----- Merge tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty Pull TTY changes from Greg Kroah-Hartman: "As we skipped the merge window for 3.6-rc1 for the tty tree, everything is now settled down and working properly, so we are ready for 3.7-rc1. Here's the patchset, it's big, but the large changes are removing a firmware file and adding a staging tty driver (it depended on the tty core changes, so it's going through this tree instead of the staging tree.) All of these patches have been in the linux-next tree for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fix up more-or-less trivial conflicts in - drivers/char/pcmcia/synclink_cs.c: tty NULL dereference fix vs tty_port_cts_enabled() helper function - drivers/staging/{Kconfig,Makefile}: add-add conflict (dgrp driver added close to other staging drivers) - drivers/staging/ipack/devices/ipoctal.c: "split ipoctal_channel from iopctal" vs "TTY: use tty_port_register_device" * tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (235 commits) tty/serial: Add kgdb_nmi driver tty/serial/amba-pl011: Quiesce interrupts in poll_get_char tty/serial/amba-pl011: Implement poll_init callback tty/serial/core: Introduce poll_init callback kdb: Turn KGDB_KDB=n stubs into static inlines kdb: Implement disable_nmi command kernel/debug: Mask KGDB NMI upon entry serial: pl011: handle corruption at high clock speeds serial: sccnxp: Make 'default' choice in switch last serial: sccnxp: Remove mask termios caps for SW flow control serial: sccnxp: Report actual baudrate back to core serial: samsung: Add poll_get_char & poll_put_char Powerpc 8xx CPM_UART setting MAXIDL register proportionaly to baud rate Powerpc 8xx CPM_UART maxidl should not depend on fifo size Powerpc 8xx CPM_UART too many interrupts Powerpc 8xx CPM_UART desynchronisation serial: set correct baud_base for EXSYS EX-41092 Dual 16950 serial: omap: fix the reciever line error case 8250: blacklist Winbond CIR port 8250_pnp: do pnp probe before legacy probe ...
148 lines
3.3 KiB
Plaintext
148 lines
3.3 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/sm7xxfb/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/ozwpan/Kconfig"
|
|
|
|
source "drivers/staging/ccg/Kconfig"
|
|
|
|
source "drivers/staging/ipack/Kconfig"
|
|
|
|
source "drivers/staging/gdm72xx/Kconfig"
|
|
|
|
source "drivers/staging/csr/Kconfig"
|
|
|
|
source "drivers/staging/omap-thermal/Kconfig"
|
|
|
|
source "drivers/staging/ramster/Kconfig"
|
|
|
|
source "drivers/staging/silicom/Kconfig"
|
|
|
|
source "drivers/staging/ced1401/Kconfig"
|
|
|
|
source "drivers/staging/imx-drm/Kconfig"
|
|
|
|
source "drivers/staging/dgrp/Kconfig"
|
|
|
|
endif # STAGING
|