mirror of
https://github.com/torvalds/linux.git
synced 2026-06-09 15:12:59 +02: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
302 lines
9.3 KiB
Makefile
302 lines
9.3 KiB
Makefile
#
|
|
# Makefile for the Linux network (ethercard) device drivers.
|
|
#
|
|
|
|
obj-$(CONFIG_MII) += mii.o
|
|
obj-$(CONFIG_MDIO) += mdio.o
|
|
obj-$(CONFIG_PHYLIB) += phy/
|
|
|
|
obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
|
|
|
|
obj-$(CONFIG_E1000) += e1000/
|
|
obj-$(CONFIG_E1000E) += e1000e/
|
|
obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
|
|
obj-$(CONFIG_IGB) += igb/
|
|
obj-$(CONFIG_IGBVF) += igbvf/
|
|
obj-$(CONFIG_IXGBE) += ixgbe/
|
|
obj-$(CONFIG_IXGBEVF) += ixgbevf/
|
|
obj-$(CONFIG_IXGB) += ixgb/
|
|
obj-$(CONFIG_IP1000) += ipg.o
|
|
obj-$(CONFIG_CHELSIO_T1) += chelsio/
|
|
obj-$(CONFIG_CHELSIO_T3) += cxgb3/
|
|
obj-$(CONFIG_CHELSIO_T4) += cxgb4/
|
|
obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/
|
|
obj-$(CONFIG_EHEA) += ehea/
|
|
obj-$(CONFIG_CAN) += can/
|
|
obj-$(CONFIG_BONDING) += bonding/
|
|
obj-$(CONFIG_ATL1) += atlx/
|
|
obj-$(CONFIG_ATL2) += atlx/
|
|
obj-$(CONFIG_ATL1E) += atl1e/
|
|
obj-$(CONFIG_ATL1C) += atl1c/
|
|
obj-$(CONFIG_GIANFAR) += gianfar_driver.o
|
|
obj-$(CONFIG_TEHUTI) += tehuti.o
|
|
obj-$(CONFIG_ENIC) += enic/
|
|
obj-$(CONFIG_JME) += jme.o
|
|
obj-$(CONFIG_BE2NET) += benet/
|
|
obj-$(CONFIG_VMXNET3) += vmxnet3/
|
|
|
|
gianfar_driver-objs := gianfar.o \
|
|
gianfar_ethtool.o \
|
|
gianfar_sysfs.o
|
|
|
|
obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
|
|
ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
|
|
|
|
obj-$(CONFIG_FSL_PQ_MDIO) += fsl_pq_mdio.o
|
|
|
|
#
|
|
# link order important here
|
|
#
|
|
obj-$(CONFIG_PLIP) += plip.o
|
|
|
|
obj-$(CONFIG_ROADRUNNER) += rrunner.o
|
|
|
|
obj-$(CONFIG_HAPPYMEAL) += sunhme.o
|
|
obj-$(CONFIG_SUNLANCE) += sunlance.o
|
|
obj-$(CONFIG_SUNQE) += sunqe.o
|
|
obj-$(CONFIG_SUNBMAC) += sunbmac.o
|
|
obj-$(CONFIG_MYRI_SBUS) += myri_sbus.o
|
|
obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
|
|
obj-$(CONFIG_CASSINI) += cassini.o
|
|
obj-$(CONFIG_SUNVNET) += sunvnet.o
|
|
|
|
obj-$(CONFIG_MACE) += mace.o
|
|
obj-$(CONFIG_BMAC) += bmac.o
|
|
|
|
obj-$(CONFIG_VORTEX) += 3c59x.o
|
|
obj-$(CONFIG_TYPHOON) += typhoon.o
|
|
obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
|
|
obj-$(CONFIG_PCNET32) += pcnet32.o
|
|
obj-$(CONFIG_E100) += e100.o
|
|
obj-$(CONFIG_TLAN) += tlan.o
|
|
obj-$(CONFIG_EPIC100) += epic100.o
|
|
obj-$(CONFIG_SMSC9420) += smsc9420.o
|
|
obj-$(CONFIG_SIS190) += sis190.o
|
|
obj-$(CONFIG_SIS900) += sis900.o
|
|
obj-$(CONFIG_R6040) += r6040.o
|
|
obj-$(CONFIG_YELLOWFIN) += yellowfin.o
|
|
obj-$(CONFIG_ACENIC) += acenic.o
|
|
obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
|
|
obj-$(CONFIG_NATSEMI) += natsemi.o
|
|
obj-$(CONFIG_NS83820) += ns83820.o
|
|
obj-$(CONFIG_STNIC) += stnic.o 8390.o
|
|
obj-$(CONFIG_FEALNX) += fealnx.o
|
|
obj-$(CONFIG_TIGON3) += tg3.o
|
|
obj-$(CONFIG_BNX2) += bnx2.o
|
|
obj-$(CONFIG_CNIC) += cnic.o
|
|
obj-$(CONFIG_BNX2X) += bnx2x/
|
|
spidernet-y += spider_net.o spider_net_ethtool.o
|
|
obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o
|
|
obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
|
|
gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
|
|
ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
|
|
obj-$(CONFIG_TC35815) += tc35815.o
|
|
obj-$(CONFIG_SKGE) += skge.o
|
|
obj-$(CONFIG_SKY2) += sky2.o
|
|
obj-$(CONFIG_SKFP) += skfp/
|
|
obj-$(CONFIG_KS8842) += ks8842.o
|
|
obj-$(CONFIG_KS8851) += ks8851.o
|
|
obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o
|
|
obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o
|
|
obj-$(CONFIG_VIA_RHINE) += via-rhine.o
|
|
obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
|
|
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
|
|
obj-$(CONFIG_RIONET) += rionet.o
|
|
obj-$(CONFIG_SH_ETH) += sh_eth.o
|
|
obj-$(CONFIG_STMMAC_ETH) += stmmac/
|
|
|
|
#
|
|
# end link order section
|
|
#
|
|
|
|
obj-$(CONFIG_SUNDANCE) += sundance.o
|
|
obj-$(CONFIG_HAMACHI) += hamachi.o
|
|
obj-$(CONFIG_NET) += Space.o loopback.o
|
|
obj-$(CONFIG_SEEQ8005) += seeq8005.o
|
|
obj-$(CONFIG_NET_SB1000) += sb1000.o
|
|
obj-$(CONFIG_MAC8390) += mac8390.o
|
|
obj-$(CONFIG_APNE) += apne.o 8390.o
|
|
obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
|
|
obj-$(CONFIG_HP100) += hp100.o
|
|
obj-$(CONFIG_SMC9194) += smc9194.o
|
|
obj-$(CONFIG_FEC) += fec.o
|
|
obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
|
|
ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
|
|
obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
|
|
endif
|
|
obj-$(CONFIG_68360_ENET) += 68360enet.o
|
|
obj-$(CONFIG_WD80x3) += wd.o 8390.o
|
|
obj-$(CONFIG_EL2) += 3c503.o 8390p.o
|
|
obj-$(CONFIG_NE2000) += ne.o 8390p.o
|
|
obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o
|
|
obj-$(CONFIG_HPLAN) += hp.o 8390p.o
|
|
obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o
|
|
obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o
|
|
obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o
|
|
obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o
|
|
obj-$(CONFIG_E2100) += e2100.o 8390.o
|
|
obj-$(CONFIG_RK29_VMAC) += rk29_vmac.o
|
|
obj-$(CONFIG_ES3210) += es3210.o 8390.o
|
|
obj-$(CONFIG_LNE390) += lne390.o 8390.o
|
|
obj-$(CONFIG_NE3210) += ne3210.o 8390.o
|
|
obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
|
|
obj-$(CONFIG_B44) += b44.o
|
|
obj-$(CONFIG_FORCEDETH) += forcedeth.o
|
|
obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
|
|
obj-$(CONFIG_AX88796) += ax88796.o
|
|
obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o
|
|
|
|
obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
|
|
obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
|
|
ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
|
|
obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
|
|
obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
|
|
obj-$(CONFIG_QLA3XXX) += qla3xxx.o
|
|
obj-$(CONFIG_QLCNIC) += qlcnic/
|
|
obj-$(CONFIG_QLGE) += qlge/
|
|
|
|
obj-$(CONFIG_PPP) += ppp_generic.o
|
|
obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
|
|
obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
|
|
obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
|
|
obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
|
|
obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
|
|
obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
|
|
obj-$(CONFIG_PPPOL2TP) += pppox.o
|
|
obj-$(CONFIG_PPPOLAC) += pppox.o pppolac.o
|
|
obj-$(CONFIG_PPPOPNS) += pppox.o pppopns.o
|
|
|
|
obj-$(CONFIG_SLIP) += slip.o
|
|
obj-$(CONFIG_SLHC) += slhc.o
|
|
|
|
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
|
|
|
|
obj-$(CONFIG_DUMMY) += dummy.o
|
|
obj-$(CONFIG_IFB) += ifb.o
|
|
obj-$(CONFIG_MACVLAN) += macvlan.o
|
|
obj-$(CONFIG_MACVTAP) += macvtap.o
|
|
obj-$(CONFIG_DE600) += de600.o
|
|
obj-$(CONFIG_DE620) += de620.o
|
|
obj-$(CONFIG_LANCE) += lance.o
|
|
obj-$(CONFIG_SUN3_82586) += sun3_82586.o
|
|
obj-$(CONFIG_SUN3LANCE) += sun3lance.o
|
|
obj-$(CONFIG_DEFXX) += defxx.o
|
|
obj-$(CONFIG_SGISEEQ) += sgiseeq.o
|
|
obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
|
|
obj-$(CONFIG_AT1700) += at1700.o
|
|
obj-$(CONFIG_EL1) += 3c501.o
|
|
obj-$(CONFIG_EL16) += 3c507.o
|
|
obj-$(CONFIG_ELMC) += 3c523.o
|
|
obj-$(CONFIG_IBMLANA) += ibmlana.o
|
|
obj-$(CONFIG_ELMC_II) += 3c527.o
|
|
obj-$(CONFIG_EL3) += 3c509.o
|
|
obj-$(CONFIG_3C515) += 3c515.o
|
|
obj-$(CONFIG_EEXPRESS) += eexpress.o
|
|
obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
|
|
obj-$(CONFIG_8139CP) += 8139cp.o
|
|
obj-$(CONFIG_8139TOO) += 8139too.o
|
|
obj-$(CONFIG_ZNET) += znet.o
|
|
obj-$(CONFIG_CPMAC) += cpmac.o
|
|
obj-$(CONFIG_DEPCA) += depca.o
|
|
obj-$(CONFIG_EWRK3) += ewrk3.o
|
|
obj-$(CONFIG_ATP) += atp.o
|
|
obj-$(CONFIG_NI5010) += ni5010.o
|
|
obj-$(CONFIG_NI52) += ni52.o
|
|
obj-$(CONFIG_NI65) += ni65.o
|
|
obj-$(CONFIG_ELPLUS) += 3c505.o
|
|
obj-$(CONFIG_AC3200) += ac3200.o 8390.o
|
|
obj-$(CONFIG_APRICOT) += 82596.o
|
|
obj-$(CONFIG_LASI_82596) += lasi_82596.o
|
|
obj-$(CONFIG_SNI_82596) += sni_82596.o
|
|
obj-$(CONFIG_MVME16x_NET) += 82596.o
|
|
obj-$(CONFIG_BVME6000_NET) += 82596.o
|
|
obj-$(CONFIG_SC92031) += sc92031.o
|
|
|
|
# This is also a 82596 and should probably be merged
|
|
obj-$(CONFIG_LP486E) += lp486e.o
|
|
|
|
obj-$(CONFIG_ETH16I) += eth16i.o
|
|
obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
|
|
obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
|
|
obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o
|
|
obj-$(CONFIG_EQUALIZER) += eql.o
|
|
obj-$(CONFIG_KORINA) += korina.o
|
|
obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
|
|
obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
|
|
obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
|
|
obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
|
|
obj-$(CONFIG_DECLANCE) += declance.o
|
|
obj-$(CONFIG_ATARILANCE) += atarilance.o
|
|
obj-$(CONFIG_A2065) += a2065.o
|
|
obj-$(CONFIG_HYDRA) += hydra.o 8390.o
|
|
obj-$(CONFIG_ARIADNE) += ariadne.o
|
|
obj-$(CONFIG_CS89x0) += cs89x0.o
|
|
obj-$(CONFIG_MACSONIC) += macsonic.o
|
|
obj-$(CONFIG_MACMACE) += macmace.o
|
|
obj-$(CONFIG_MAC89x0) += mac89x0.o
|
|
obj-$(CONFIG_TUN) += tun.o
|
|
obj-$(CONFIG_VETH) += veth.o
|
|
obj-$(CONFIG_NET_NETX) += netx-eth.o
|
|
obj-$(CONFIG_DL2K) += dl2k.o
|
|
obj-$(CONFIG_R8169) += r8169.o
|
|
obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
|
|
obj-$(CONFIG_IBMVETH) += ibmveth.o
|
|
obj-$(CONFIG_S2IO) += s2io.o
|
|
obj-$(CONFIG_VXGE) += vxge/
|
|
obj-$(CONFIG_MYRI10GE) += myri10ge/
|
|
obj-$(CONFIG_SMC91X) += smc91x.o
|
|
obj-$(CONFIG_SMC911X) += smc911x.o
|
|
obj-$(CONFIG_SMSC911X) += smsc911x.o
|
|
obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
|
|
obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
|
|
obj-$(CONFIG_DM9000) += dm9000.o
|
|
obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
|
|
pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
|
|
obj-$(CONFIG_MLX4_CORE) += mlx4/
|
|
obj-$(CONFIG_ENC28J60) += enc28j60.o
|
|
obj-$(CONFIG_ETHOC) += ethoc.o
|
|
obj-$(CONFIG_GRETH) += greth.o
|
|
|
|
obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
|
|
|
|
obj-$(CONFIG_DNET) += dnet.o
|
|
obj-$(CONFIG_MACB) += macb.o
|
|
obj-$(CONFIG_S6GMAC) += s6gmac.o
|
|
|
|
obj-$(CONFIG_ARM) += arm/
|
|
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
|
|
obj-$(CONFIG_TR) += tokenring/
|
|
obj-$(CONFIG_WAN) += wan/
|
|
obj-$(CONFIG_ARCNET) += arcnet/
|
|
obj-$(CONFIG_NET_PCMCIA) += pcmcia/
|
|
|
|
obj-$(CONFIG_USB_CATC) += usb/
|
|
obj-$(CONFIG_USB_KAWETH) += usb/
|
|
obj-$(CONFIG_USB_PEGASUS) += usb/
|
|
obj-$(CONFIG_USB_RTL8150) += usb/
|
|
obj-$(CONFIG_USB_HSO) += usb/
|
|
obj-$(CONFIG_USB_USBNET) += usb/
|
|
obj-$(CONFIG_USB_ZD1201) += usb/
|
|
obj-$(CONFIG_USB_IPHETH) += usb/
|
|
|
|
obj-$(CONFIG_WLAN) += wireless/
|
|
obj-$(CONFIG_NET_TULIP) += tulip/
|
|
obj-$(CONFIG_HAMRADIO) += hamradio/
|
|
obj-$(CONFIG_IRDA) += irda/
|
|
obj-$(CONFIG_ETRAX_ETHERNET) += cris/
|
|
obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/
|
|
|
|
obj-$(CONFIG_NETCONSOLE) += netconsole.o
|
|
|
|
obj-$(CONFIG_FS_ENET) += fs_enet/
|
|
|
|
obj-$(CONFIG_NETXEN_NIC) += netxen/
|
|
obj-$(CONFIG_NIU) += niu.o
|
|
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
|
|
obj-$(CONFIG_SFC) += sfc/
|
|
|
|
obj-$(CONFIG_WIMAX) += wimax/
|
|
obj-$(CONFIG_CAIF) += caif/
|
|
|
|
obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
|