1
linux/arch/arm/mach-omap1/include/mach
Linus Torvalds 7b6181e068 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (163 commits)
  omap: complete removal of machine_desc.io_pg_offst and .phys_io
  omap: UART: fix wakeup registers for OMAP24xx UART2
  omap: Fix spotty MMC voltages
  ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h
  serial: omap-serial: fix signess error
  OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish
  omap: dma: Fix buffering disable bit setting for omap24xx
  omap: serial: Fix the boot-up crash/reboot without CONFIG_PM
  OMAP3: PM: fix scratchpad memory accesses for off-mode
  omap4: pandaboard: enable the ehci port on pandaboard
  omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
  omap4: pandaboard: remove unused hsmmc definition
  OMAP: McBSP: Remove null omap44xx ops comment
  OMAP: McBSP: Swap CLKS source definition
  OMAP: McBSP: Fix CLKR and FSR signal muxing
  OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks
  OMAP: control: move plat-omap/control.h to mach-omap2/control.h
  OMAP: split plat-omap/common.c
  OMAP: McBSP: implement functional clock switching via clock framework
  OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c
  ...

Fixed up trivial conflicts in arch/arm/mach-omap2/
{board-zoom-peripherals.c,devices.c} as per Tony
2010-10-25 13:46:56 -07:00
..
ams-delta-fiq.h OMAP1: Amstrad Delta: add a handler for processing interruptsgenerated by the FIQ routine 2010-05-05 11:11:10 -07:00
camera.h OMAP1: Add support for SoC camera interface 2010-10-01 16:37:00 -07:00
clkdev.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
debug-macro.S arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
entry-macro.S
gpio.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
hardware.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
io.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
irqs.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
lcd_dma.h omap1: DMA: move LCD related code from plat-omap to mach-omap1 2009-12-11 16:16:33 -08:00
lcdc.h omap1: LCD_DMA: Use some define rather than a hexadecimal 2009-12-11 16:16:36 -08:00
memory.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
mtd-xip.h omap: headers: Move mtd-xip.h to be mach-omap1 specific 2009-10-19 17:32:55 -07:00
smp.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
system.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
timex.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
uncompress.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
vmalloc.h ARM: do not define VMALLOC_END relative to PAGE_OFFSET 2010-10-01 22:28:19 -04:00