davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
952414505f
kernel-ark/arch/arm/mach-u300/include/mach
History
Linus Torvalds 952414505f Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc 
* 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
  ARM: mach-mxs: fix machines' initializers order
  mmc: mxcmmc: explicitly includes mach/hardware.h
  arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
  arm/imx: remove mx27_setup_weimcs() from mx27.h
  arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
  arm/imx: remove mx31_setup_weimcs() from mx31.h
  ARM: tegra: devices.c should include devices.h
  ARM: tegra: cpu-tegra: unexport two functions
  ARM: tegra: cpu-tegra: sparse type fix
  ARM: tegra: dma: staticify some tables and functions
  ARM: tegra: tegra2_clocks: don't export some tables
  ARM: tegra: tegra_powergate_is_powered should be static
  ARM: tegra: tegra_rtc_read_ms should be static
  ARM: tegra: tegra_init_cache should be static
  ARM: tegra: pcie: 0 -> NULL changes
  ARM: tegra: pcie: include board.h
  ARM: tegra: pcie: don't cast __iomem pointers
  ARM: tegra: tegra2_clocks: 0 -> NULL changes
  ARM: tegra: tegra2_clocks: don't cast __iomem pointers
  ARM: tegra: timer: don't cast __iomem pointers
  ...

Fix up trivial conflicts in
  arch/arm/mach-omap2/Makefile,
  arch/arm/mach-u300/{Makefile.boot,core.c}
  arch/arm/plat-{mxc,omap}/devices.c
2011-11-01 20:11:00 -07: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: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -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: mark empty gpio.h files empty 2011-10-29 13:05:46 +02:00
hardware.h
io.h
irqs.h ARM: 7083/1: rewrite U300 GPIO to use gpiolib 2011-09-08 10:03:56 +01:00
memory.h Merge branch 'depends/rmk/devel-stable' into next/cleanup 2011-10-08 21:07:42 +02: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