linux-kernel-test/arch/arm/mach-shmobile/include/mach
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
..
clkdev.h
common.h ARM: mach-shmobile: sh7372 A3SM support 2011-09-25 23:20:49 +02:00
dma.h
entry-macro.S ARM: mach-shmobile: Rely on run-time IRQ handlers 2011-01-07 10:43:02 +09:00
gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
hardware.h ARM: mach-shmobile: Rely on run-time IRQ handlers 2011-01-07 10:43:02 +09:00
head-ap4evb.txt ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot 2011-05-24 12:15:20 +09:00
head-mackerel.txt ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot 2011-05-24 12:15:20 +09:00
io.h
irqs.h ARM: mach-shmobile: Bump up NR_IRQS to 1024 2010-12-21 00:27:55 +09:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
mmc-ap4eb.h mmc, ARM: Rename SuperH Mobile ARM zboot helpers 2011-03-25 01:24:57 +09:00
mmc-mackerel.h mmc, ARM: Rename SuperH Mobile ARM zboot helpers 2011-03-25 01:24:57 +09:00
mmc.h ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL 2011-04-06 11:08:20 -07:00
sdhi-sh7372.h ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM 2011-06-29 10:00:52 +01:00
sdhi.h ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM 2011-06-29 10:00:52 +01:00
sh73a0.h ARM: mach-shmobile: sh73a0: mark DMA slave ID 0 as invalid 2011-05-25 11:37:24 +09:00
sh7367.h ARM: mach-shmobile: sh7367 and G3EVM pinmux support 2010-02-12 14:10:47 +09:00
sh7372.h ARM: mach-shmobile: sh7372 A4R support (v4) 2011-10-22 00:20:12 +02:00
sh7377.h ARM: mach-shmobile: sh7377 and G4EVM pinmux support 2010-02-15 13:43:37 +09:00
system.h
timex.h
uncompress.h
vmalloc.h ARM: mach-shmobile: fix compile warning in mm/init.c 2010-12-17 19:41:13 +09:00
zboot_macros.h ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM 2010-12-05 08:40:21 +00:00
zboot.h ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL 2011-04-06 11:08:20 -07:00