linux_dsm_epyc7002/arch/arm/mach-omap2
Linus Torvalds ca90666287 Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
* 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
  ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>
  ARM: 7104/1: plat-pxa: break out GPIO driver specifics
  ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
  ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
  ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>
  ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
  ARM: 7083/1: rewrite U300 GPIO to use gpiolib
  ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
  ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
  ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
  ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
  ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
  ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
  ARM: 7057/1: mach-pnx4008: rename GPIO header
  ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>
  ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
  ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
  ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
  ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
  ARM: 7043/1: mach-ixp2000: rename GPIO header
  ...

Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually
2011-10-27 08:39:10 +02:00
..
include/mach
board-2430sdp.c
board-3430sdp.c
board-3630sdp.c
board-4430sdp.c
board-am3517crane.c
board-am3517evm.c
board-apollon.c
board-cm-t35.c
board-cm-t3517.c
board-devkit8000.c
board-flash.c
board-flash.h
board-generic.c
board-h4.c
board-igep0020.c
board-ldp.c
board-n8x0.c
board-omap3beagle.c
board-omap3evm.c
board-omap3logic.c
board-omap3pandora.c
board-omap3stalker.c
board-omap3touchbook.c
board-omap4panda.c
board-overo.c
board-rm680.c
board-rx51-peripherals.c
board-rx51-video.c
board-rx51.c
board-ti8168evm.c
board-zoom-debugboard.c
board-zoom-display.c
board-zoom-peripherals.c
board-zoom.c
clkt2xxx_apll.c
clkt2xxx_dpll.c
clkt2xxx_dpllcore.c
clkt2xxx_osc.c
clkt2xxx_sys.c
clkt2xxx_virt_prcm_set.c
clkt34xx_dpll3m2.c
clkt_clksel.c
clkt_dpll.c
clkt_iclk.c
clock2xxx.c
clock2xxx.h
clock3xxx_data.c
clock3xxx.c
clock3xxx.h
clock34xx.c
clock34xx.h
clock36xx.c
clock36xx.h
clock44xx_data.c
clock44xx.h
clock2420_data.c
clock2430_data.c
clock2430.c
clock3517.c
clock3517.h
clock_common_data.c
clock.c
clock.h
clockdomain2xxx_3xxx.c
clockdomain44xx.c
clockdomain.c
clockdomain.h
clockdomains2xxx_3xxx_data.c
clockdomains44xx_data.c
cm1_44xx.h
cm2_44xx.h
cm2xxx_3xxx.c
cm2xxx_3xxx.h
cm44xx.c
cm44xx.h
cm-regbits-24xx.h
cm-regbits-34xx.h
cm-regbits-44xx.h
cm.h
cminst44xx.c
cminst44xx.h
common-board-devices.c
common-board-devices.h
common.c
control.c
control.h
cpuidle34xx.c
devices.c
devices.h
display.c
dma.c
dpll3xxx.c
dpll44xx.c
dsp.c
emu.c
gpio.c
gpmc-nand.c
gpmc-onenand.c
gpmc-smc91x.c
gpmc-smsc911x.c
gpmc.c
hsmmc.c
hsmmc.h
hwspinlock.c
i2c.c
id.c
io.c
io.h
iommu2.c
irq.c
Kconfig
mailbox.c
Makefile
Makefile.boot
mcbsp.c
mux34xx.c
mux34xx.h
mux44xx.c
mux44xx.h
mux2420.c
mux2420.h
mux2430.c
mux2430.h
mux.c
mux.h
omap4-common.c
omap44xx-smc.S
omap_hwmod_2xxx_3xxx_interconnect_data.c
omap_hwmod_2xxx_3xxx_ipblock_data.c
omap_hwmod_2xxx_interconnect_data.c
omap_hwmod_2xxx_ipblock_data.c
omap_hwmod_3xxx_data.c
omap_hwmod_44xx_data.c
omap_hwmod_2420_data.c
omap_hwmod_2430_data.c
omap_hwmod_common_data.c
omap_hwmod_common_data.h
omap_hwmod.c
omap_l3_noc.c
omap_l3_noc.h
omap_l3_smx.c
omap_l3_smx.h
omap_opp_data.h
omap_phy_internal.c
omap_twl.c
omap-headsmp.S
omap-hotplug.c
omap-iommu.c
omap-smp.c
opp2xxx.h
opp3xxx_data.c
opp4xxx_data.c
opp2420_data.c
opp2430_data.c
opp.c
pm24xx.c
pm34xx.c
pm44xx.c
pm-debug.c
pm.c
pm.h
powerdomain2xxx_3xxx.c
powerdomain44xx.c
powerdomain-common.c
powerdomain.c
powerdomain.h
powerdomains2xxx_3xxx_data.c
powerdomains2xxx_3xxx_data.h
powerdomains2xxx_data.c
powerdomains3xxx_data.c
powerdomains44xx_data.c
prcm44xx.h
prcm_mpu44xx.c
prcm_mpu44xx.h
prcm-common.h
prcm.c
prm2xxx_3xxx.c
prm2xxx_3xxx.h
prm44xx.c
prm44xx.h
prm-regbits-24xx.h
prm-regbits-34xx.h
prm-regbits-44xx.h
prm.h
prminst44xx.c
prminst44xx.h
scrm44xx.h
sdram-hynix-h8mbx00u0mer-0em.h
sdram-micron-mt46h32m32lf-6.h
sdram-nokia.c
sdram-nokia.h
sdram-numonyx-m65kxxxxam.h
sdram-qimonda-hyb18m512160af-6.h
sdrc2xxx.c
sdrc.c
sdrc.h
serial.c
sleep24xx.S
sleep34xx.S
smartreflex-class3.c
smartreflex.c
smartreflex.h
sr_device.c
sram34xx.S
sram242x.S
sram243x.S
timer-mpu.c
timer.c
twl-common.c
twl-common.h
usb-fs.c
usb-host.c
usb-musb.c
usb-tusb6010.c
vc3xxx_data.c
vc44xx_data.c
vc.h
voltage.c
voltage.h
voltagedomains3xxx_data.c
voltagedomains44xx_data.c
vp3xxx_data.c
vp44xx_data.c
vp.h
wd_timer.c
wd_timer.h