kernel-ark/arch/arm/plat-omap/include/plat
Greg Kroah-Hartman 10af77c193 Merge 3.4-rc4 into tty-next
This resolves the merge problem with:
	drivers/tty/serial/pch_uart.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-23 09:39:23 -07:00
..
am33xx.h ARM: OMAP: am33xx: Update common OMAP machine specific sources 2011-12-13 10:46:43 -08:00
board-ams-delta.h ASoC: OMAP: ams-delta: drop .set_bias_level callback 2012-03-05 11:25:34 -08:00
board-sx1.h
board-voiceblue.h
board.h OMAP: Remove OMAP_TAG_LCD and OMAP_TAG_FBMEM 2012-02-23 09:39:27 +02:00
clkdev_omap.h ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
clock.h ARM: OMAP: clock: cleanup CPUfreq leftovers, fix build errors 2012-04-14 17:49:07 -07:00
common.h Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD 2012-01-05 12:55:03 +00:00
cpu.h ARM: SoC specific updates 2012-03-27 16:14:44 -07:00
dma-44xx.h
dma.h am3505/3517: Various platform defines for UART4 2011-08-10 03:38:07 -07:00
dmtimer.h ARM: OMAP: change get_context_loss_count ret value to int 2011-11-04 17:41:07 -07:00
dsp.h
flash.h
fpga.h
gpio-switch.h
gpio.h Merge branch 'fixes-gpio-to-irq' into fixes 2012-03-29 10:16:04 -07:00
gpmc-smc91x.h
gpmc-smsc911x.h
gpmc.h
hardware.h ARM: create a common IOMEM definition 2012-03-13 21:22:09 -05:00
i2c.h OMAP: hwmod: fix the i2c-reset timeout during bootup 2011-07-10 05:27:16 -06:00
iommu2.h omap: iommu: omapify 'struct iommu' and exposed API 2011-08-26 11:46:01 +02:00
iommu.h iommu/omap: eliminate the public omap_find_iommu_device() method 2011-12-05 15:47:39 +02:00
iopgtable.h omap: iommu: omapify 'struct iommu' and exposed API 2011-08-26 11:46:01 +02:00
iovmm.h iommu/omap: eliminate the public omap_find_iommu_device() method 2011-12-05 15:47:39 +02:00
irda.h
irqs-44xx.h
irqs.h ARM: OMAP: irqs: Fix NR_IRQS value to handle PRCM interrupts 2012-02-28 15:49:54 -08:00
keypad.h ARM: OMAP2+: Limit omap_read/write usage to legacy USB drivers 2012-02-24 10:34:36 -08:00
l3_2xxx.h
l3_3xxx.h
l4_2xxx.h
l4_3xxx.h
lcd_mipid.h
led.h
mailbox.h
mcbsp.h ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header 2012-03-12 13:34:23 +00:00
mcspi.h ARM: OMAP: McSPI: Remove unused flag from struct omap2_mcspi_device_config 2012-02-24 10:33:58 -08:00
menelaus.h
mmc.h mmc: omap_hsmmc: remove unused .set_sleep function 2012-03-27 12:19:59 -04:00
multi.h
mux.h
nand.h
omap4-keypad.h Input: omap4-keypad - move platform_data to <linux/platform_data> 2012-03-16 22:49:46 -07:00
omap7xx.h
omap16xx.h
omap24xx.h
omap34xx.h ARM: OMAP: am33xx: Update common OMAP machine specific sources 2011-12-13 10:46:43 -08:00
omap44xx.h ARM: OMAP4: PM: Add SAR RAM support 2011-12-08 11:28:59 -08:00
omap730.h
omap850.h
omap1510.h
omap_device.h ARM: OMAP: omap_device: remove omap_device_parent 2012-03-05 15:38:02 -08:00
omap_hwmod.h ARM: OMAP2+: hwmod: add softreset delay field and OMAP4 data 2012-04-13 05:08:03 -06:00
omap-pm.h ARM: OMAP: change get_context_loss_count ret value to int 2011-11-04 17:41:07 -07:00
omap-secure.h ARM: OMAP4: Move the barrier memboclk_steal() as part of reserve callback 2012-02-14 11:42:42 -08:00
omap-serial.h OMAP2+: UART: Remove cpu checks for populating errata flags 2012-04-18 15:07:05 -07:00
onenand.h
param.h
prcm.h
remoteproc.h remoteproc/omap: add a remoteproc driver for OMAP4 2012-02-08 22:53:47 +02:00
sdrc.h ARM: OMAP: Remove remaining includes for mach/io.h 2012-03-06 21:34:38 -06:00
serial.h ARM: OMAP2+: remove some orphan function declarations. 2012-02-21 11:13:11 -08:00
sram.h ARM: OMAP: sram: Add am33xx SRAM support (minimal) 2012-03-05 16:11:01 -08:00
tc.h ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h 2012-02-24 10:34:35 -08:00
ti81xx.h ARM: OMAP: TI81XX: Prepare for addition of TI814X support 2011-12-13 10:46:44 -08:00
timex.h
uncompress.h ARM: OMAP: add minimal support for Nokia RM-696 2012-03-05 11:08:37 -08:00
usb.h ARM: create a common IOMEM definition 2012-03-13 21:22:09 -05:00
voltage.h omap: voltage: add a stub header file for external/regulator use 2011-09-15 12:09:22 -07:00
vram.h OMAPDSS: Remove video SRAM support 2012-02-23 09:38:26 +02:00
vrfb.h