leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ca90666287
linux/arch/arm/mach-u300/include/mach
History
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 [ARM] 5474/1: U300 clocking framework 2009-04-28 22:44:12 +01:00
coh901318.h mach-u300: define a dummy filter function for coh901318 2011-03-14 14:05:17 +01:00
debug-macro.S arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
dma_channels.h ARM: 5852/1: Add COH 901 318 DMA driver platform config for U300 2010-01-27 22:00:15 +00:00
entry-macro.S [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
gpio-u300.h ARM: 7083/1: rewrite U300 GPIO to use gpiolib 2011-09-08 10:03:56 +01:00
gpio.h ARM: 7083/1: rewrite U300 GPIO to use gpiolib 2011-09-08 10:03:56 +01:00
hardware.h [ARM] 5470/1: U300 register definitions 2009-04-28 22:44:05 +01:00
io.h [ARM] 5470/1: U300 register definitions 2009-04-28 22:44:05 +01:00
irqs.h ARM: 7083/1: rewrite U300 GPIO to use gpiolib 2011-09-08 10:03:56 +01:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
platform.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
syscon.h pinctrl: add a driver for the U300 pinmux 2011-10-13 12:57:45 +02:00
system.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
timex.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
u300-regs.h ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors 2011-06-09 10:15:06 +01:00
uncompress.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
vmalloc.h ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15 21:40:33 +00:00