Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/arm/plat-omap/include/plat
History
Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37 
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c
2010-08-16 18:42:58 +01:00
..
blizzard.h
board-ams-delta.h
board-sx1.h
board-voiceblue.h
board.h omap: Move omap2 FS USB platform init code into mach-omap2/usb-fs.c 2010-07-05 16:31:29 +03:00
clkdev.h
clkdev_omap.h
clock.h OMAP: clock: add kerneldoc for structures; move flags closer to structs 2010-07-26 16:34:27 -06:00
clockdomain.h
common.h Merge branch 'devel-map-io' into omap-for-linus 2010-08-04 14:43:45 +03:00
control.h omap4: Adding PBIAS Configuration for MMC1 Controller 2010-05-20 11:21:22 -07:00
cpu.h OMAP3630: Add ES1.1 and ES1.2 detection 2010-08-04 14:43:51 +03:00
display.h OMAP: DSS2: change manual update scaling setup 2010-08-05 16:52:03 +03:00
dma-44xx.h
dma.h omap: dma: Support for prefetch in destination synchronizedtransfer 2010-08-02 14:21:40 +03:00
dmtimer.h
flash.h
fpga.h
gpio-switch.h
gpio.h OMAP2/3: GPIO: generalize prepare for idle 2010-05-12 09:39:16 -07:00
gpmc-smc91x.h
gpmc.h omap3 nand: cleanup virtual address usages 2010-08-02 15:30:38 +03:00
hardware.h
hwa742.h
i2c.h
io.h
iommu.h omap iommu: add functionality to get TLB miss interrupt 2010-06-29 07:55:07 +03:00
iommu2.h
iovmm.h
irda.h
irqs-44xx.h
irqs.h omap: add missing FIQ_START definition required forarch/arm/kernel/fiq.c compilation 2010-05-05 11:11:10 -07:00
keypad.h
lcd_mipid.h
led.h
mailbox.h omap: mailbox: reorganize headers 2010-08-04 15:50:20 +03:00
mcbsp.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
mcspi.h
memory.h
menelaus.h
mmc.h omap_hsmmc: add init_card pass-through callback 2010-08-11 08:59:04 -07:00
multi.h omap2/3/4: Fix multi.h when omap3 and omap4 are selected without omap2 2010-05-03 17:21:31 -07:00
mux.h Merge branch 'devel-misc' into omap-for-linus 2010-08-02 14:23:38 +03:00
nand.h omap3 nand: cleanup virtual address usages 2010-08-02 15:30:38 +03:00
nokia-dsi-panel.h OMAP: DSS2: Add Nokia DSI command mode panel configuration struct 2010-08-03 15:18:48 +03:00
omap-alsa.h
omap-pm.h OMAP: PM constraints: add omap_pm_set_min_clk_rate() 2010-07-26 16:34:34 -06:00
omap7xx.h
omap16xx.h
omap24xx.h
omap34xx.h crypto: omap - Updates omap sham device related platform code 2010-05-03 11:10:03 +08:00
omap44xx.h OMAP4: PRM: Remove MPU internal code name and apply PRCM naming convention 2010-05-20 12:31:11 -06:00
omap730.h
omap850.h
omap1510.h
omap_device.h OMAP: hwmod/device: add omap_{device,hwmod}_get_mpu_rt_va 2010-07-26 16:34:33 -06:00
omap_hwmod.h OMAP: hwmod/device: add omap_{device,hwmod}_get_mpu_rt_va 2010-07-26 16:34:33 -06:00
onenand.h
param.h
powerdomain.h OMAP4 powerdomain: Support LOWPOWERSTATECHANGE for powerdomains 2010-05-20 12:31:13 -06:00
prcm.h
sdrc.h
serial.h omap2/3: Fix DEBUG_LL for omap zoom2/3 2010-05-03 17:53:08 -07:00
smp.h omap4: Add smc API to read AuxCoreBoot0 register 2010-08-02 13:18:18 +03:00
sram.h
system.h
tc.h
timer-gp.h
timex.h
uncompress.h omap: Add back UART MDR1 check into uncompress.h 2010-08-02 14:21:39 +03:00
usb.h omap: Move omap1 USB platform init code into mach-omap1/usb.c 2010-07-05 16:31:30 +03:00
vram.h ARM: OMAP: Convert OMAPFB and VRAM SDRAM reservation to LMB 2010-07-27 08:48:23 +01:00
vrfb.h