mirror of
https://github.com/hardkernel/linux.git
synced 2026-04-20 04:21:14 +09:00
Conflicts: Makefile arch/arm/Kconfig arch/arm/Makefile arch/arm/common/Kconfig arch/arm/common/Makefile arch/arm/common/pl330.c arch/arm/include/asm/dma.h arch/arm/include/asm/memory.h arch/arm/kernel/Makefile arch/arm/kernel/dma.c arch/arm/kernel/process.c arch/arm/mm/Kconfig arch/arm/mm/mmu.c arch/arm/mm/proc-v7.S arch/arm/oprofile/op_model_v7.c arch/arm/tools/mach-types block/blk-core.c drivers/base/firmware_class.c drivers/base/platform.c drivers/bluetooth/Kconfig drivers/bluetooth/hci_h4.c drivers/char/Makefile drivers/gpio/Kconfig drivers/gpio/Makefile drivers/gpio/gpiolib.c drivers/gpio/wm831x-gpio.c drivers/gpio/wm8994-gpio.c drivers/i2c/busses/Kconfig drivers/i2c/busses/Makefile drivers/i2c/i2c-core.c drivers/input/keyboard/Kconfig drivers/input/keyboard/Makefile drivers/input/keyboard/matrix_keypad.c drivers/input/misc/Kconfig drivers/input/misc/Makefile drivers/input/misc/wm831x-on.c drivers/input/touchscreen/Kconfig drivers/input/touchscreen/Makefile drivers/leds/Kconfig drivers/leds/Makefile drivers/media/video/Kconfig drivers/media/video/Makefile drivers/media/video/soc_camera.c drivers/media/video/uvc/uvc_queue.c drivers/mfd/Kconfig drivers/mfd/Makefile drivers/mfd/wm831x-core.c drivers/mfd/wm831x-irq.c drivers/mfd/wm8994-core.c drivers/misc/Kconfig drivers/misc/Makefile drivers/mmc/core/sdio_io.c drivers/mtd/mtd_blkdevs.c drivers/mtd/mtdblock.c drivers/mtd/nand/Makefile drivers/net/dm9000.c drivers/net/irda/Kconfig drivers/net/usb/Kconfig drivers/net/usb/Makefile drivers/net/wireless/Kconfig drivers/net/wireless/Makefile drivers/net/wireless/adm8211.c drivers/net/wireless/adm8211.h drivers/net/wireless/airo.c drivers/net/wireless/airo_cs.c drivers/net/wireless/at76c50x-usb.c drivers/net/wireless/at76c50x-usb.h drivers/net/wireless/ath/Kconfig drivers/net/wireless/ath/Makefile drivers/net/wireless/ath/ar9170/Kconfig drivers/net/wireless/ath/ar9170/ar9170.h drivers/net/wireless/ath/ar9170/cmd.c drivers/net/wireless/ath/ar9170/cmd.h drivers/net/wireless/ath/ar9170/eeprom.h drivers/net/wireless/ath/ar9170/hw.h drivers/net/wireless/ath/ar9170/led.c drivers/net/wireless/ath/ar9170/mac.c drivers/net/wireless/ath/ar9170/main.c drivers/net/wireless/ath/ar9170/phy.c drivers/net/wireless/ath/ar9170/usb.c drivers/net/wireless/ath/ar9170/usb.h drivers/net/wireless/ath/ath.h drivers/net/wireless/ath/ath5k/Kconfig drivers/net/wireless/ath/ath5k/Makefile drivers/net/wireless/ath/ath5k/ath5k.h drivers/net/wireless/ath/ath5k/attach.c drivers/net/wireless/ath/ath5k/base.c drivers/net/wireless/ath/ath5k/base.h drivers/net/wireless/ath/ath5k/caps.c drivers/net/wireless/ath/ath5k/debug.c drivers/net/wireless/ath/ath5k/debug.h drivers/net/wireless/ath/ath5k/desc.c drivers/net/wireless/ath/ath5k/desc.h drivers/net/wireless/ath/ath5k/dma.c drivers/net/wireless/ath/ath5k/eeprom.c drivers/net/wireless/ath/ath5k/eeprom.h drivers/net/wireless/ath/ath5k/gpio.c drivers/net/wireless/ath/ath5k/initvals.c drivers/net/wireless/ath/ath5k/led.c drivers/net/wireless/ath/ath5k/pcu.c drivers/net/wireless/ath/ath5k/phy.c drivers/net/wireless/ath/ath5k/qcu.c drivers/net/wireless/ath/ath5k/reg.h drivers/net/wireless/ath/ath5k/reset.c drivers/net/wireless/ath/ath9k/Kconfig drivers/net/wireless/ath/ath9k/Makefile drivers/net/wireless/ath/ath9k/ahb.c drivers/net/wireless/ath/ath9k/ani.c drivers/net/wireless/ath/ath9k/ani.h drivers/net/wireless/ath/ath9k/ath9k.h drivers/net/wireless/ath/ath9k/beacon.c drivers/net/wireless/ath/ath9k/btcoex.c drivers/net/wireless/ath/ath9k/btcoex.h drivers/net/wireless/ath/ath9k/calib.c drivers/net/wireless/ath/ath9k/calib.h drivers/net/wireless/ath/ath9k/debug.c drivers/net/wireless/ath/ath9k/debug.h drivers/net/wireless/ath/ath9k/eeprom.c drivers/net/wireless/ath/ath9k/eeprom.h drivers/net/wireless/ath/ath9k/eeprom_4k.c drivers/net/wireless/ath/ath9k/eeprom_9287.c drivers/net/wireless/ath/ath9k/eeprom_def.c drivers/net/wireless/ath/ath9k/hw.c drivers/net/wireless/ath/ath9k/hw.h drivers/net/wireless/ath/ath9k/mac.c drivers/net/wireless/ath/ath9k/mac.h drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/ath/ath9k/pci.c drivers/net/wireless/ath/ath9k/phy.h drivers/net/wireless/ath/ath9k/rc.c drivers/net/wireless/ath/ath9k/rc.h drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/ath/ath9k/reg.h drivers/net/wireless/ath/ath9k/virtual.c drivers/net/wireless/ath/ath9k/xmit.c drivers/net/wireless/ath/regd.c drivers/net/wireless/ath/regd.h drivers/net/wireless/ath/regd_common.h drivers/net/wireless/atmel.c drivers/net/wireless/atmel_cs.c drivers/net/wireless/atmel_pci.c drivers/net/wireless/b43/Kconfig drivers/net/wireless/b43/Makefile drivers/net/wireless/b43/b43.h drivers/net/wireless/b43/dma.c drivers/net/wireless/b43/dma.h drivers/net/wireless/b43/leds.c drivers/net/wireless/b43/lo.c drivers/net/wireless/b43/main.c drivers/net/wireless/b43/pcmcia.c drivers/net/wireless/b43/phy_a.c drivers/net/wireless/b43/phy_common.c drivers/net/wireless/b43/phy_common.h drivers/net/wireless/b43/phy_g.c drivers/net/wireless/b43/phy_lp.c drivers/net/wireless/b43/phy_lp.h drivers/net/wireless/b43/phy_n.c drivers/net/wireless/b43/phy_n.h drivers/net/wireless/b43/pio.c drivers/net/wireless/b43/pio.h drivers/net/wireless/b43/rfkill.c drivers/net/wireless/b43/sdio.c drivers/net/wireless/b43/tables_nphy.c drivers/net/wireless/b43/tables_nphy.h drivers/net/wireless/b43/wa.c drivers/net/wireless/b43/xmit.c drivers/net/wireless/b43/xmit.h drivers/net/wireless/b43legacy/Kconfig drivers/net/wireless/b43legacy/b43legacy.h drivers/net/wireless/b43legacy/dma.c drivers/net/wireless/b43legacy/dma.h drivers/net/wireless/b43legacy/leds.h drivers/net/wireless/b43legacy/main.c drivers/net/wireless/b43legacy/phy.c drivers/net/wireless/b43legacy/pio.c drivers/net/wireless/b43legacy/pio.h drivers/net/wireless/b43legacy/rfkill.c drivers/net/wireless/b43legacy/xmit.c drivers/net/wireless/b43legacy/xmit.h drivers/net/wireless/bcm4329/Kconfig drivers/net/wireless/bcm4329/Makefile drivers/net/wireless/bcm4329/bcmsdh_linux.c drivers/net/wireless/bcm4329/bcmsdh_sdmmc_linux.c drivers/net/wireless/bcm4329/dhd.h drivers/net/wireless/bcm4329/dhd_cdc.c drivers/net/wireless/bcm4329/dhd_common.c drivers/net/wireless/bcm4329/dhd_custom_gpio.c drivers/net/wireless/bcm4329/dhd_linux.c drivers/net/wireless/bcm4329/dhd_sdio.c drivers/net/wireless/bcm4329/include/epivers.h drivers/net/wireless/bcm4329/include/wlioctl.h drivers/net/wireless/bcm4329/linux_osl.c drivers/net/wireless/bcm4329/wl_iw.c drivers/net/wireless/bcm4329/wl_iw.h drivers/net/wireless/hostap/Kconfig drivers/net/wireless/hostap/hostap_80211.h drivers/net/wireless/hostap/hostap_80211_rx.c drivers/net/wireless/hostap/hostap_80211_tx.c drivers/net/wireless/hostap/hostap_ap.c drivers/net/wireless/hostap/hostap_common.h drivers/net/wireless/hostap/hostap_cs.c drivers/net/wireless/hostap/hostap_download.c drivers/net/wireless/hostap/hostap_hw.c drivers/net/wireless/hostap/hostap_info.c drivers/net/wireless/hostap/hostap_ioctl.c drivers/net/wireless/hostap/hostap_main.c drivers/net/wireless/hostap/hostap_pci.c drivers/net/wireless/hostap/hostap_plx.c drivers/net/wireless/hostap/hostap_wlan.h drivers/net/wireless/ipw2x00/Kconfig drivers/net/wireless/ipw2x00/ipw2100.c drivers/net/wireless/ipw2x00/ipw2100.h drivers/net/wireless/ipw2x00/ipw2200.c drivers/net/wireless/ipw2x00/ipw2200.h drivers/net/wireless/ipw2x00/libipw.h drivers/net/wireless/ipw2x00/libipw_geo.c drivers/net/wireless/ipw2x00/libipw_module.c drivers/net/wireless/ipw2x00/libipw_rx.c drivers/net/wireless/ipw2x00/libipw_tx.c drivers/net/wireless/ipw2x00/libipw_wx.c drivers/net/wireless/iwlwifi/Kconfig drivers/net/wireless/iwlwifi/Makefile drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-3945-fh.h drivers/net/wireless/iwlwifi/iwl-3945-hw.h drivers/net/wireless/iwlwifi/iwl-3945-led.c drivers/net/wireless/iwlwifi/iwl-3945-led.h drivers/net/wireless/iwlwifi/iwl-3945-rs.c drivers/net/wireless/iwlwifi/iwl-3945.c drivers/net/wireless/iwlwifi/iwl-3945.h drivers/net/wireless/iwlwifi/iwl-4965-hw.h drivers/net/wireless/iwlwifi/iwl-4965.c drivers/net/wireless/iwlwifi/iwl-5000-hw.h drivers/net/wireless/iwlwifi/iwl-5000.c drivers/net/wireless/iwlwifi/iwl-6000-hw.h drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-agn-rs.c drivers/net/wireless/iwlwifi/iwl-agn-rs.h drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl-calib.h drivers/net/wireless/iwlwifi/iwl-commands.h drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/iwlwifi/iwl-csr.h drivers/net/wireless/iwlwifi/iwl-debug.h drivers/net/wireless/iwlwifi/iwl-debugfs.c drivers/net/wireless/iwlwifi/iwl-dev.h drivers/net/wireless/iwlwifi/iwl-eeprom.c drivers/net/wireless/iwlwifi/iwl-eeprom.h drivers/net/wireless/iwlwifi/iwl-fh.h drivers/net/wireless/iwlwifi/iwl-hcmd.c drivers/net/wireless/iwlwifi/iwl-helpers.h drivers/net/wireless/iwlwifi/iwl-io.h drivers/net/wireless/iwlwifi/iwl-led.c drivers/net/wireless/iwlwifi/iwl-led.h drivers/net/wireless/iwlwifi/iwl-power.c drivers/net/wireless/iwlwifi/iwl-power.h drivers/net/wireless/iwlwifi/iwl-prph.h drivers/net/wireless/iwlwifi/iwl-rx.c drivers/net/wireless/iwlwifi/iwl-scan.c drivers/net/wireless/iwlwifi/iwl-spectrum.h drivers/net/wireless/iwlwifi/iwl-sta.c drivers/net/wireless/iwlwifi/iwl-sta.h drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/iwlwifi/iwl3945-base.c drivers/net/wireless/iwmc3200wifi/Kconfig drivers/net/wireless/iwmc3200wifi/Makefile drivers/net/wireless/iwmc3200wifi/bus.h drivers/net/wireless/iwmc3200wifi/cfg80211.c drivers/net/wireless/iwmc3200wifi/commands.c drivers/net/wireless/iwmc3200wifi/commands.h drivers/net/wireless/iwmc3200wifi/debug.h drivers/net/wireless/iwmc3200wifi/debugfs.c drivers/net/wireless/iwmc3200wifi/eeprom.c drivers/net/wireless/iwmc3200wifi/eeprom.h drivers/net/wireless/iwmc3200wifi/fw.c drivers/net/wireless/iwmc3200wifi/hal.c drivers/net/wireless/iwmc3200wifi/hal.h drivers/net/wireless/iwmc3200wifi/iwm.h drivers/net/wireless/iwmc3200wifi/lmac.h drivers/net/wireless/iwmc3200wifi/main.c drivers/net/wireless/iwmc3200wifi/netdev.c drivers/net/wireless/iwmc3200wifi/rx.c drivers/net/wireless/iwmc3200wifi/sdio.c drivers/net/wireless/iwmc3200wifi/tx.c drivers/net/wireless/iwmc3200wifi/umac.h drivers/net/wireless/libertas/Makefile drivers/net/wireless/libertas/README drivers/net/wireless/libertas/cmd.c drivers/net/wireless/libertas/cmd.h drivers/net/wireless/libertas/cmdresp.c drivers/net/wireless/libertas/debugfs.c drivers/net/wireless/libertas/decl.h drivers/net/wireless/libertas/defs.h drivers/net/wireless/libertas/dev.h drivers/net/wireless/libertas/ethtool.c drivers/net/wireless/libertas/host.h drivers/net/wireless/libertas/if_cs.c drivers/net/wireless/libertas/if_sdio.c drivers/net/wireless/libertas/if_sdio.h drivers/net/wireless/libertas/if_spi.c drivers/net/wireless/libertas/if_usb.c drivers/net/wireless/libertas/main.c drivers/net/wireless/libertas/radiotap.h drivers/net/wireless/libertas/rx.c drivers/net/wireless/libertas/tx.c drivers/net/wireless/libertas/types.h drivers/net/wireless/libertas_tf/cmd.c drivers/net/wireless/libertas_tf/if_usb.c drivers/net/wireless/libertas_tf/libertas_tf.h drivers/net/wireless/libertas_tf/main.c drivers/net/wireless/mac80211_hwsim.c drivers/net/wireless/mv8686/scan.h drivers/net/wireless/mv8686/wext.h drivers/net/wireless/mwl8k.c drivers/net/wireless/orinoco/Kconfig drivers/net/wireless/orinoco/Makefile drivers/net/wireless/orinoco/airport.c drivers/net/wireless/orinoco/cfg.c drivers/net/wireless/orinoco/fw.c drivers/net/wireless/orinoco/hermes.c drivers/net/wireless/orinoco/hermes.h drivers/net/wireless/orinoco/hermes_dld.c drivers/net/wireless/orinoco/hw.c drivers/net/wireless/orinoco/hw.h drivers/net/wireless/orinoco/main.c drivers/net/wireless/orinoco/main.h drivers/net/wireless/orinoco/orinoco.h drivers/net/wireless/orinoco/orinoco_cs.c drivers/net/wireless/orinoco/orinoco_nortel.c drivers/net/wireless/orinoco/orinoco_pci.c drivers/net/wireless/orinoco/orinoco_plx.c drivers/net/wireless/orinoco/orinoco_tmd.c drivers/net/wireless/orinoco/scan.c drivers/net/wireless/orinoco/spectrum_cs.c drivers/net/wireless/orinoco/wext.c drivers/net/wireless/p54/Kconfig drivers/net/wireless/p54/eeprom.c drivers/net/wireless/p54/fwio.c drivers/net/wireless/p54/led.c drivers/net/wireless/p54/main.c drivers/net/wireless/p54/net2280.h drivers/net/wireless/p54/p54.h drivers/net/wireless/p54/p54pci.c drivers/net/wireless/p54/p54pci.h drivers/net/wireless/p54/p54spi.c drivers/net/wireless/p54/p54spi.h drivers/net/wireless/p54/p54usb.c drivers/net/wireless/p54/p54usb.h drivers/net/wireless/p54/txrx.c drivers/net/wireless/prism54/isl_ioctl.c drivers/net/wireless/prism54/isl_oid.h drivers/net/wireless/prism54/islpci_dev.c drivers/net/wireless/prism54/islpci_eth.c drivers/net/wireless/prism54/islpci_eth.h drivers/net/wireless/prism54/islpci_hotplug.c drivers/net/wireless/prism54/islpci_mgt.c drivers/net/wireless/prism54/islpci_mgt.h drivers/net/wireless/prism54/oid_mgt.c drivers/net/wireless/ray_cs.c drivers/net/wireless/ray_cs.h drivers/net/wireless/rndis_wlan.c drivers/net/wireless/rt2x00/Kconfig drivers/net/wireless/rt2x00/Makefile drivers/net/wireless/rt2x00/rt2400pci.c drivers/net/wireless/rt2x00/rt2400pci.h drivers/net/wireless/rt2x00/rt2500pci.c drivers/net/wireless/rt2x00/rt2500pci.h drivers/net/wireless/rt2x00/rt2500usb.c drivers/net/wireless/rt2x00/rt2500usb.h drivers/net/wireless/rt2x00/rt2800usb.c drivers/net/wireless/rt2x00/rt2800usb.h drivers/net/wireless/rt2x00/rt2x00.h drivers/net/wireless/rt2x00/rt2x00config.c drivers/net/wireless/rt2x00/rt2x00crypto.c drivers/net/wireless/rt2x00/rt2x00debug.c drivers/net/wireless/rt2x00/rt2x00debug.h drivers/net/wireless/rt2x00/rt2x00dev.c drivers/net/wireless/rt2x00/rt2x00dump.h drivers/net/wireless/rt2x00/rt2x00firmware.c drivers/net/wireless/rt2x00/rt2x00ht.c drivers/net/wireless/rt2x00/rt2x00leds.c drivers/net/wireless/rt2x00/rt2x00leds.h drivers/net/wireless/rt2x00/rt2x00lib.h drivers/net/wireless/rt2x00/rt2x00link.c drivers/net/wireless/rt2x00/rt2x00mac.c drivers/net/wireless/rt2x00/rt2x00pci.c drivers/net/wireless/rt2x00/rt2x00pci.h drivers/net/wireless/rt2x00/rt2x00queue.c drivers/net/wireless/rt2x00/rt2x00queue.h drivers/net/wireless/rt2x00/rt2x00reg.h drivers/net/wireless/rt2x00/rt2x00usb.c drivers/net/wireless/rt2x00/rt2x00usb.h drivers/net/wireless/rt2x00/rt61pci.c drivers/net/wireless/rt2x00/rt61pci.h drivers/net/wireless/rt2x00/rt73usb.c drivers/net/wireless/rt2x00/rt73usb.h drivers/net/wireless/rtl818x/rtl8180.h drivers/net/wireless/rtl818x/rtl8180_dev.c drivers/net/wireless/rtl818x/rtl8180_grf5101.c drivers/net/wireless/rtl818x/rtl8180_max2820.c drivers/net/wireless/rtl818x/rtl8180_rtl8225.c drivers/net/wireless/rtl818x/rtl8180_sa2400.c drivers/net/wireless/rtl818x/rtl8187.h drivers/net/wireless/rtl818x/rtl8187_dev.c drivers/net/wireless/rtl818x/rtl8187_leds.c drivers/net/wireless/rtl818x/rtl8187_leds.h drivers/net/wireless/rtl818x/rtl8187_rfkill.c drivers/net/wireless/rtl818x/rtl8187_rtl8225.c drivers/net/wireless/rtl818x/rtl818x.h drivers/net/wireless/wl12xx/Kconfig drivers/net/wireless/wl12xx/Makefile drivers/net/wireless/wl12xx/wl1251.h drivers/net/wireless/wl12xx/wl1251_acx.c drivers/net/wireless/wl12xx/wl1251_acx.h drivers/net/wireless/wl12xx/wl1251_boot.c drivers/net/wireless/wl12xx/wl1251_cmd.c drivers/net/wireless/wl12xx/wl1251_cmd.h drivers/net/wireless/wl12xx/wl1251_debugfs.c drivers/net/wireless/wl12xx/wl1251_event.c drivers/net/wireless/wl12xx/wl1251_event.h drivers/net/wireless/wl12xx/wl1251_init.c drivers/net/wireless/wl12xx/wl1251_init.h drivers/net/wireless/wl12xx/wl1251_io.h drivers/net/wireless/wl12xx/wl1251_main.c drivers/net/wireless/wl12xx/wl1251_ps.c drivers/net/wireless/wl12xx/wl1251_ps.h drivers/net/wireless/wl12xx/wl1251_reg.h drivers/net/wireless/wl12xx/wl1251_rx.c drivers/net/wireless/wl12xx/wl1251_rx.h drivers/net/wireless/wl12xx/wl1251_sdio.c drivers/net/wireless/wl12xx/wl1251_spi.c drivers/net/wireless/wl12xx/wl1251_tx.c drivers/net/wireless/wl12xx/wl1251_tx.h drivers/net/wireless/wl12xx/wl1271.h drivers/net/wireless/wl12xx/wl1271_acx.c drivers/net/wireless/wl12xx/wl1271_acx.h drivers/net/wireless/wl12xx/wl1271_boot.c drivers/net/wireless/wl12xx/wl1271_boot.h drivers/net/wireless/wl12xx/wl1271_cmd.c drivers/net/wireless/wl12xx/wl1271_cmd.h drivers/net/wireless/wl12xx/wl1271_debugfs.c drivers/net/wireless/wl12xx/wl1271_event.c drivers/net/wireless/wl12xx/wl1271_event.h drivers/net/wireless/wl12xx/wl1271_init.c drivers/net/wireless/wl12xx/wl1271_init.h drivers/net/wireless/wl12xx/wl1271_main.c drivers/net/wireless/wl12xx/wl1271_ps.c drivers/net/wireless/wl12xx/wl1271_ps.h drivers/net/wireless/wl12xx/wl1271_reg.h drivers/net/wireless/wl12xx/wl1271_rx.c drivers/net/wireless/wl12xx/wl1271_rx.h drivers/net/wireless/wl12xx/wl1271_spi.c drivers/net/wireless/wl12xx/wl1271_tx.c drivers/net/wireless/wl12xx/wl1271_tx.h drivers/net/wireless/wl12xx/wl12xx_80211.h drivers/net/wireless/wl3501.h drivers/net/wireless/wl3501_cs.c drivers/net/wireless/zd1201.c drivers/net/wireless/zd1211rw/Kconfig drivers/net/wireless/zd1211rw/zd_chip.c drivers/net/wireless/zd1211rw/zd_chip.h drivers/net/wireless/zd1211rw/zd_mac.c drivers/net/wireless/zd1211rw/zd_mac.h drivers/net/wireless/zd1211rw/zd_rf_uw2453.c drivers/net/wireless/zd1211rw/zd_usb.c drivers/net/wireless/zd1211rw/zd_usb.h drivers/power/Kconfig drivers/power/Makefile drivers/power/wm831x_backup.c drivers/power/wm831x_power.c drivers/regulator/Kconfig drivers/regulator/Makefile drivers/regulator/wm831x-dcdc.c drivers/regulator/wm8994-regulator.c drivers/rtc/Makefile drivers/rtc/rtc-wm831x.c drivers/serial/Kconfig drivers/spi/Kconfig drivers/spi/Makefile drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/dream/Kconfig drivers/staging/iio/Kconfig drivers/staging/iio/Makefile drivers/usb/core/hub.c drivers/usb/gadget/gadget_chips.h drivers/video/Kconfig drivers/video/backlight/Kconfig drivers/video/backlight/Makefile drivers/video/backlight/wm831x_bl.c drivers/watchdog/Kconfig drivers/watchdog/Makefile fs/partitions/check.c include/asm-generic/gpio.h include/linux/fb.h include/linux/i82593.h include/linux/l3g4200d.h include/linux/mfd/wm831x/core.h include/linux/mfd/wm831x/pdata.h include/linux/mfd/wm8994/core.h include/linux/mfd/wm8994/gpio.h include/linux/mfd/wm8994/pdata.h include/linux/mmc/card.h include/linux/mmc/host.h include/linux/mtd/nand.h include/linux/serial_core.h include/linux/videodev2.h include/media/v4l2-chip-ident.h include/sound/soc-dai.h include/sound/soc-dapm.h sound/soc/codecs/Kconfig sound/soc/codecs/Makefile sound/soc/codecs/wm8900.c sound/soc/codecs/wm8988.c sound/soc/codecs/wm8994.c sound/soc/codecs/wm8994.h sound/soc/codecs/wm_hubs.c sound/soc/soc-dapm.c
431 lines
14 KiB
Plaintext
Executable File
431 lines
14 KiB
Plaintext
Executable File
menu "Infrared-port device drivers"
|
|
depends on IRDA!=n
|
|
|
|
comment "SIR device drivers"
|
|
|
|
config IRTTY_SIR
|
|
tristate "IrTTY (uses Linux serial driver)"
|
|
depends on IRDA
|
|
help
|
|
Say Y here if you want to build support for the IrTTY line
|
|
discipline. To compile it as a module, choose M here: the module
|
|
will be called irtty-sir. IrTTY makes it possible to use Linux's
|
|
own serial driver for all IrDA ports that are 16550 compatible.
|
|
Most IrDA chips are 16550 compatible so you should probably say Y
|
|
to this option. Using IrTTY will however limit the speed of the
|
|
connection to 115200 bps (IrDA SIR mode).
|
|
|
|
If unsure, say Y.
|
|
|
|
config BFIN_SIR
|
|
tristate "Blackfin SIR on UART"
|
|
depends on BLACKFIN && IRDA
|
|
default n
|
|
help
|
|
Say Y here if your want to enable SIR function on Blackfin UART
|
|
devices.
|
|
|
|
To activate this driver you can start irattach like:
|
|
"irattach irda0 -s"
|
|
|
|
Saying M, it will be built as a module named bfin_sir.
|
|
|
|
Note that you need to turn off one of the serial drivers for SIR
|
|
to use that UART.
|
|
|
|
config BFIN_SIR0
|
|
bool "Blackfin SIR on UART0"
|
|
depends on BFIN_SIR && !SERIAL_BFIN_UART0
|
|
|
|
config BFIN_SIR1
|
|
bool "Blackfin SIR on UART1"
|
|
depends on BFIN_SIR && !SERIAL_BFIN_UART1 && (!BF531 && !BF532 && !BF533 && !BF561)
|
|
|
|
config BFIN_SIR2
|
|
bool "Blackfin SIR on UART2"
|
|
depends on BFIN_SIR && !SERIAL_BFIN_UART2 && (BF54x || BF538 || BF539)
|
|
|
|
config BFIN_SIR3
|
|
bool "Blackfin SIR on UART3"
|
|
depends on BFIN_SIR && !SERIAL_BFIN_UART3 && (BF54x)
|
|
|
|
choice
|
|
prompt "SIR Mode"
|
|
depends on BFIN_SIR
|
|
default SIR_BFIN_DMA
|
|
|
|
config SIR_BFIN_DMA
|
|
bool "DMA mode"
|
|
depends on !DMA_UNCACHED_NONE
|
|
|
|
config SIR_BFIN_PIO
|
|
bool "PIO mode"
|
|
endchoice
|
|
|
|
comment "Dongle support"
|
|
|
|
config SH_SIR
|
|
tristate "SuperH SIR on UART"
|
|
depends on IRDA && SUPERH && \
|
|
(CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7723 || \
|
|
CPU_SUBTYPE_SH7724)
|
|
default n
|
|
help
|
|
Say Y here if your want to enable SIR function on SuperH UART
|
|
devices.
|
|
|
|
config DONGLE
|
|
bool "Serial dongle support"
|
|
depends on IRTTY_SIR
|
|
help
|
|
Say Y here if you have an infrared device that connects to your
|
|
computer's serial port. These devices are called dongles. Then say Y
|
|
or M to the driver for your particular dongle below.
|
|
|
|
Note that the answer to this question won't directly affect the
|
|
kernel: saying N will just cause the configurator to skip all
|
|
the questions about serial dongles.
|
|
|
|
config ESI_DONGLE
|
|
tristate "ESI JetEye PC dongle"
|
|
depends on IRTTY_SIR && DONGLE && IRDA
|
|
help
|
|
Say Y here if you want to build support for the Extended Systems
|
|
JetEye PC dongle. To compile it as a module, choose M here. The ESI
|
|
dongle attaches to the normal 9-pin serial port connector, and can
|
|
currently only be used by IrTTY. To activate support for ESI
|
|
dongles you will have to start irattach like this:
|
|
"irattach -d esi".
|
|
|
|
config ACTISYS_DONGLE
|
|
tristate "ACTiSYS IR-220L and IR220L+ dongle"
|
|
depends on IRTTY_SIR && DONGLE && IRDA
|
|
help
|
|
Say Y here if you want to build support for the ACTiSYS IR-220L and
|
|
IR220L+ dongles. To compile it as a module, choose M here. The
|
|
ACTiSYS dongles attaches to the normal 9-pin serial port connector,
|
|
and can currently only be used by IrTTY. To activate support for
|
|
ACTiSYS dongles you will have to start irattach like this:
|
|
"irattach -d actisys" or "irattach -d actisys+".
|
|
|
|
config TEKRAM_DONGLE
|
|
tristate "Tekram IrMate 210B dongle"
|
|
depends on IRTTY_SIR && DONGLE && IRDA
|
|
help
|
|
Say Y here if you want to build support for the Tekram IrMate 210B
|
|
dongle. To compile it as a module, choose M here. The Tekram dongle
|
|
attaches to the normal 9-pin serial port connector, and can
|
|
currently only be used by IrTTY. To activate support for Tekram
|
|
dongles you will have to start irattach like this:
|
|
"irattach -d tekram".
|
|
|
|
config TOIM3232_DONGLE
|
|
tristate "TOIM3232 IrDa dongle"
|
|
depends on IRTTY_SIR && DONGLE && IRDA
|
|
help
|
|
Say Y here if you want to build support for the Vishay/Temic
|
|
TOIM3232 and TOIM4232 based dongles.
|
|
To compile it as a module, choose M here.
|
|
|
|
config LITELINK_DONGLE
|
|
tristate "Parallax LiteLink dongle"
|
|
depends on IRTTY_SIR && DONGLE && IRDA
|
|
help
|
|
Say Y here if you want to build support for the Parallax Litelink
|
|
dongle. To compile it as a module, choose M here. The Parallax
|
|
dongle attaches to the normal 9-pin serial port connector, and can
|
|
currently only be used by IrTTY. To activate support for Parallax
|
|
dongles you will have to start irattach like this:
|
|
"irattach -d litelink".
|
|
|
|
config MA600_DONGLE
|
|
tristate "Mobile Action MA600 dongle"
|
|
depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
|
|
help
|
|
Say Y here if you want to build support for the Mobile Action MA600
|
|
dongle. To compile it as a module, choose M here. The MA600 dongle
|
|
attaches to the normal 9-pin serial port connector, and can
|
|
currently only be used by IrTTY. The driver should also support
|
|
the MA620 USB version of the dongle, if the integrated USB-to-RS232
|
|
converter is supported by usbserial. To activate support for
|
|
MA600 dongle you will have to start irattach like this:
|
|
"irattach -d ma600".
|
|
|
|
config GIRBIL_DONGLE
|
|
tristate "Greenwich GIrBIL dongle"
|
|
depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
|
|
help
|
|
Say Y here if you want to build support for the Greenwich GIrBIL
|
|
dongle. If you want to compile it as a module, choose M here.
|
|
The Greenwich dongle attaches to the normal 9-pin serial port
|
|
connector, and can currently only be used by IrTTY. To activate
|
|
support for Greenwich dongles you will have to start irattach
|
|
like this: "irattach -d girbil".
|
|
|
|
config MCP2120_DONGLE
|
|
tristate "Microchip MCP2120"
|
|
depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
|
|
help
|
|
Say Y here if you want to build support for the Microchip MCP2120
|
|
dongle. If you want to compile it as a module, choose M here.
|
|
The MCP2120 dongle attaches to the normal 9-pin serial port
|
|
connector, and can currently only be used by IrTTY. To activate
|
|
support for MCP2120 dongles you will have to start irattach
|
|
like this: "irattach -d mcp2120".
|
|
|
|
You must build this dongle yourself. For more information see:
|
|
<http://www.eyetap.org/~tangf/irda_sir_linux.html>
|
|
|
|
config OLD_BELKIN_DONGLE
|
|
tristate "Old Belkin dongle"
|
|
depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
|
|
help
|
|
Say Y here if you want to build support for the Adaptec Airport 1000
|
|
and 2000 dongles. If you want to compile it as a module, choose
|
|
M here. Some information is contained in the comments
|
|
at the top of <file:drivers/net/irda/old_belkin.c>.
|
|
|
|
config ACT200L_DONGLE
|
|
tristate "ACTiSYS IR-200L dongle"
|
|
depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
|
|
help
|
|
Say Y here if you want to build support for the ACTiSYS IR-200L
|
|
dongle. If you want to compile it as a module, choose M here.
|
|
The ACTiSYS IR-200L dongle attaches to the normal 9-pin serial
|
|
port connector, and can currently only be used by IrTTY.
|
|
To activate support for ACTiSYS IR-200L dongle you will have to
|
|
start irattach like this: "irattach -d act200l".
|
|
|
|
config KINGSUN_DONGLE
|
|
tristate "KingSun/DonShine DS-620 IrDA-USB dongle"
|
|
depends on IRDA && USB && EXPERIMENTAL
|
|
help
|
|
Say Y or M here if you want to build support for the KingSun/DonShine
|
|
DS-620 IrDA-USB bridge device driver.
|
|
|
|
This USB bridge does not conform to the IrDA-USB device class
|
|
specification, and therefore needs its own specific driver. This
|
|
dongle supports SIR speed only (9600 bps).
|
|
|
|
To compile it as a module, choose M here: the module will be called
|
|
kingsun-sir.
|
|
|
|
config EP7211_DONGLE
|
|
tristate "EP7211 I/R support"
|
|
depends on IRTTY_SIR && ARCH_EP7211 && IRDA && EXPERIMENTAL
|
|
help
|
|
Say Y here if you want to build support for the Cirrus logic
|
|
EP7211 chipset's infrared module.
|
|
|
|
config KSDAZZLE_DONGLE
|
|
tristate "KingSun Dazzle IrDA-USB dongle (EXPERIMENTAL)"
|
|
depends on IRDA && USB && EXPERIMENTAL
|
|
help
|
|
Say Y or M here if you want to build support for the KingSun Dazzle
|
|
IrDA-USB bridge device driver.
|
|
|
|
This USB bridge does not conform to the IrDA-USB device class
|
|
specification, and therefore needs its own specific driver. This
|
|
dongle supports SIR speeds only (9600 through 115200 bps).
|
|
|
|
To compile it as a module, choose M here: the module will be called
|
|
ksdazzle-sir.
|
|
|
|
config KS959_DONGLE
|
|
tristate "KingSun KS-959 IrDA-USB dongle (EXPERIMENTAL)"
|
|
depends on IRDA && USB && EXPERIMENTAL
|
|
help
|
|
Say Y or M here if you want to build support for the KingSun KS-959
|
|
IrDA-USB bridge device driver.
|
|
|
|
This USB bridge does not conform to the IrDA-USB device class
|
|
specification, and therefore needs its own specific driver. This
|
|
dongle supports SIR speeds only (9600 through 57600 bps).
|
|
|
|
To compile it as a module, choose M here: the module will be called
|
|
ks959-sir.
|
|
|
|
comment "FIR device drivers"
|
|
|
|
config USB_IRDA
|
|
tristate "IrDA USB dongles"
|
|
depends on IRDA && USB
|
|
select FW_LOADER
|
|
---help---
|
|
Say Y here if you want to build support for the USB IrDA FIR Dongle
|
|
device driver. To compile it as a module, choose M here: the module
|
|
will be called irda-usb. IrDA-USB support the various IrDA USB
|
|
dongles available and most of their peculiarities. Those dongles
|
|
plug in the USB port of your computer, are plug and play, and
|
|
support SIR and FIR (4Mbps) speeds. On the other hand, those
|
|
dongles tend to be less efficient than a FIR chipset.
|
|
|
|
Please note that the driver is still experimental. And of course,
|
|
you will need both USB and IrDA support in your kernel...
|
|
|
|
config SIGMATEL_FIR
|
|
tristate "SigmaTel STIr4200 bridge (EXPERIMENTAL)"
|
|
depends on IRDA && USB && EXPERIMENTAL
|
|
select CRC32
|
|
---help---
|
|
Say Y here if you want to build support for the SigmaTel STIr4200
|
|
USB IrDA FIR bridge device driver.
|
|
|
|
USB bridge based on the SigmaTel STIr4200 don't conform to the
|
|
IrDA-USB device class specification, and therefore need their
|
|
own specific driver. Those dongles support SIR and FIR (4Mbps)
|
|
speeds.
|
|
|
|
To compile it as a module, choose M here: the module will be called
|
|
stir4200.
|
|
|
|
config NSC_FIR
|
|
tristate "NSC PC87108/PC87338"
|
|
depends on IRDA && ISA_DMA_API
|
|
help
|
|
Say Y here if you want to build support for the NSC PC87108 and
|
|
PC87338 IrDA chipsets. This driver supports SIR,
|
|
MIR and FIR (4Mbps) speeds.
|
|
|
|
To compile it as a module, choose M here: the module will be called
|
|
nsc-ircc.
|
|
|
|
config WINBOND_FIR
|
|
tristate "Winbond W83977AF (IR)"
|
|
depends on IRDA && ISA_DMA_API
|
|
help
|
|
Say Y here if you want to build IrDA support for the Winbond
|
|
W83977AF super-io chipset. This driver should be used for the IrDA
|
|
chipset in the Corel NetWinder. The driver supports SIR, MIR and
|
|
FIR (4Mbps) speeds.
|
|
|
|
To compile it as a module, choose M here: the module will be called
|
|
w83977af_ir.
|
|
|
|
config TOSHIBA_FIR
|
|
tristate "Toshiba Type-O IR Port"
|
|
depends on IRDA && PCI && !64BIT && VIRT_TO_BUS
|
|
help
|
|
Say Y here if you want to build support for the Toshiba Type-O IR
|
|
and Donau oboe chipsets. These chipsets are used by the Toshiba
|
|
Libretto 100/110CT, Tecra 8100, Portege 7020 and many more laptops.
|
|
To compile it as a module, choose M here: the module will be called
|
|
donauboe.
|
|
|
|
config AU1000_FIR
|
|
tristate "Alchemy Au1000 SIR/FIR"
|
|
depends on SOC_AU1000 && IRDA
|
|
|
|
config SMC_IRCC_FIR
|
|
tristate "SMSC IrCC (EXPERIMENTAL)"
|
|
depends on EXPERIMENTAL && IRDA && ISA_DMA_API
|
|
help
|
|
Say Y here if you want to build support for the SMC Infrared
|
|
Communications Controller. It is used in a wide variety of
|
|
laptops (Fujitsu, Sony, Compaq and some Toshiba).
|
|
To compile it as a module, choose M here: the module will be called
|
|
smsc-ircc2.o.
|
|
|
|
config ALI_FIR
|
|
tristate "ALi M5123 FIR (EXPERIMENTAL)"
|
|
depends on EXPERIMENTAL && IRDA && ISA_DMA_API
|
|
help
|
|
Say Y here if you want to build support for the ALi M5123 FIR
|
|
Controller. The ALi M5123 FIR Controller is embedded in ALi M1543C,
|
|
M1535, M1535D, M1535+, M1535D South Bridge. This driver supports
|
|
SIR, MIR and FIR (4Mbps) speeds.
|
|
|
|
To compile it as a module, choose M here: the module will be called
|
|
ali-ircc.
|
|
|
|
config VLSI_FIR
|
|
tristate "VLSI 82C147 SIR/MIR/FIR (EXPERIMENTAL)"
|
|
depends on EXPERIMENTAL && IRDA && PCI
|
|
help
|
|
Say Y here if you want to build support for the VLSI 82C147
|
|
PCI-IrDA Controller. This controller is used by the HP OmniBook 800
|
|
and 5500 notebooks. The driver provides support for SIR, MIR and
|
|
FIR (4Mbps) speeds.
|
|
|
|
To compile it as a module, choose M here: the module will be called
|
|
vlsi_ir.
|
|
|
|
config SA1100_FIR
|
|
tristate "SA1100 Internal IR"
|
|
depends on ARCH_SA1100 && IRDA
|
|
|
|
config VIA_FIR
|
|
tristate "VIA VT8231/VT1211 SIR/MIR/FIR"
|
|
depends on IRDA && ISA_DMA_API
|
|
help
|
|
Say Y here if you want to build support for the VIA VT8231
|
|
and VIA VT1211 IrDA controllers, found on the motherboards using
|
|
those VIA chipsets. To use this controller, you will need
|
|
to plug a specific 5 pins FIR IrDA dongle in the specific
|
|
motherboard connector. The driver provides support for SIR, MIR
|
|
and FIR (4Mbps) speeds.
|
|
|
|
You will need to specify the 'dongle_id' module parameter to
|
|
indicate the FIR dongle attached to the controller.
|
|
|
|
To compile it as a module, choose M here: the module will be called
|
|
via-ircc.
|
|
|
|
config PXA_FICP
|
|
tristate "Intel PXA2xx Internal FICP"
|
|
depends on ARCH_PXA && IRDA
|
|
help
|
|
Say Y or M here if you want to build support for the PXA2xx
|
|
built-in IRDA interface which can support both SIR and FIR.
|
|
This driver relies on platform specific helper routines so
|
|
available capabilities may vary from one PXA2xx target to
|
|
another.
|
|
|
|
config MCS_FIR
|
|
tristate "MosChip MCS7780 IrDA-USB dongle"
|
|
depends on IRDA && USB && EXPERIMENTAL
|
|
select CRC32
|
|
help
|
|
Say Y or M here if you want to build support for the MosChip
|
|
MCS7780 IrDA-USB bridge device driver.
|
|
|
|
USB bridge based on the MosChip MCS7780 don't conform to the
|
|
IrDA-USB device class specification, and therefore need their
|
|
own specific driver. Those dongles support SIR and FIR (4Mbps)
|
|
speeds.
|
|
|
|
To compile it as a module, choose M here: the module will be called
|
|
mcs7780.
|
|
|
|
config RK_IRDA
|
|
tristate "rockchip rk29 IrDA"
|
|
depends on IRDA && RK29_SMC
|
|
help
|
|
Say Y or M here if you want to build support for the rk29
|
|
built-in IRDA interface which can support both SIR, MIR and FIR.
|
|
|
|
choice
|
|
depends on RK_IRDA
|
|
prompt "irda device driver"
|
|
config RK_IRDA_UART
|
|
bool "uses irda as a serial device"
|
|
config RK_IRDA_NET
|
|
bool "uses irda as a network device"
|
|
endchoice
|
|
|
|
choice
|
|
depends on RK_IRDA
|
|
prompt "irda module select"
|
|
config BU92725GUW
|
|
bool "bu92725guw"
|
|
endchoice
|
|
|
|
config SH_IRDA
|
|
tristate "SuperH IrDA driver"
|
|
depends on IRDA && ARCH_SHMOBILE
|
|
help
|
|
Say Y here if your want to enable SuperH IrDA devices.
|
|
|
|
endmenu
|
|
|