kernel-ark/arch/arm/plat-omap/include/plat
Arnd Bergmann f907ab06bb Merge branch 'next/fixes-non-critical' into next/drivers
Conflicts:
	arch/arm/mach-lpc32xx/clock.c
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c

The conflicts with pxa are non-obvious, we have multiple branches
adding and removing the same clock settings. According to
Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
fix here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-20 22:42:24 +00:00
..
am33xx.h ARM: OMAP: am33xx: Update common OMAP machine specific sources 2011-12-13 10:46:43 -08:00
blizzard.h
board-ams-delta.h
board-sx1.h
board-voiceblue.h
board.h
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: TI814X: Add cpu type macros and detection support 2011-12-13 10:46:45 -08: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: OMAP: Remove definition cpu_is_omap4430() 2012-03-05 16:11:03 -08: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 OMAP: fix compilation error 2011-05-31 06:17:01 -07:00
fpga.h
gpio-switch.h
gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
gpmc-smc91x.h
gpmc-smsc911x.h arm: omap: gpmc-smsc911x: minor style fixes 2011-05-03 00:38:58 -07:00
gpmc.h Fix common misspellings 2011-03-31 11:26:23 -03:00
hardware.h ARM: OMAP: TI81XX: Prepare for addition of TI814X support 2011-12-13 10:46:44 -08:00
hwa742.h
i2c.h OMAP: hwmod: fix the i2c-reset timeout during bootup 2011-07-10 05:27:16 -06:00
io.h ARM: OMAP: am33xx: Update common OMAP machine specific sources 2011-12-13 10:46:43 -08: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
l3_2xxx.h
l3_3xxx.h
l4_2xxx.h
l4_3xxx.h
lcd_mipid.h
led.h
mailbox.h
mcbsp.h ARM: OMAP: mcbsp: Start generalize signal muxing functions 2011-09-26 17:49:07 -07:00
mcspi.h
menelaus.h
mmc.h ARM: OMAP: hsmmc: add pm_caps field 2011-12-08 16:26:20 -08:00
multi.h
mux.h
nand.h omap: cleanup NAND platform data 2011-06-29 01:11:37 -07:00
omap4-keypad.h OMAP4: Keyboard: Mux changes in the board file 2011-07-05 03:38:24 -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: Expose omap_device_{alloc, delete, register} 2012-02-20 10:00:39 -08:00
omap_hwmod.h ARM: OMAP3+: SmartReflex: use voltage domain name in device attributes 2012-03-05 11:29:25 -08: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 ARM: OMAP2+: UART: Remove omap_uart_can_sleep and add pm_qos 2011-12-14 16:05:26 -08:00
onenand.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1 2011-03-25 17:41:20 +02:00
param.h
prcm.h
sdrc.h
serial.h power management changes for omap and imx 2012-01-09 14:39:59 -08:00
sram.h ARM: OMAP: sram: Add am33xx SRAM support (minimal) 2012-03-05 16:11:01 -08:00
tc.h
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: TI814X: Create board support and enable build for TI8148 EVM 2011-12-13 10:48:55 -08:00
usb.h Driver specific changes 2012-01-09 14:39:22 -08:00
voltage.h omap: voltage: add a stub header file for external/regulator use 2011-09-15 12:09:22 -07:00
vram.h
vrfb.h