q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/arm/mach-omap2
History
Tony Lindgren deee6d5359 ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart changes 
ARM restart changes needed changes to common.h to make it local.
This conflicted with v3.2-rc4 DSS related hwmod changes that
git mergetool was not able to handle.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2011-12-06 20:27:02 +00:00
..
include/mach Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
board-2430sdp.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-3430sdp.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-3630sdp.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-4430sdp.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-am3517crane.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-am3517evm.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-apollon.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-cm-t35.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-cm-t3517.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-devkit8000.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-flash.c
board-flash.h
board-generic.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-h4.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-igep0020.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-ldp.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-n8x0.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-omap3beagle.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-omap3evm.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-omap3logic.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-omap3pandora.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-omap3stalker.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-omap3touchbook.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-omap4panda.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-overo.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-rm680.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-rx51-peripherals.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
board-rx51-video.c
board-rx51.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
board-ti8168evm.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
board-zoom-debugboard.c
board-zoom-display.c
board-zoom-peripherals.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
board-zoom.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
clkt2xxx_apll.c
clkt2xxx_dpll.c
clkt2xxx_dpllcore.c
clkt2xxx_osc.c
clkt2xxx_sys.c
clkt2xxx_virt_prcm_set.c
clkt34xx_dpll3m2.c
clkt_clksel.c
clkt_dpll.c
clkt_iclk.c
clock.c
clock.h
clock2xxx.c
clock2xxx.h
clock3xxx.c
clock3xxx.h
clock3xxx_data.c
clock34xx.c
clock34xx.h
clock36xx.c
clock36xx.h
clock44xx.h
clock44xx_data.c
clock2420_data.c
clock2430.c
clock2430_data.c
clock3517.c
clock3517.h
clock_common_data.c
clockdomain.c
clockdomain.h
clockdomain2xxx_3xxx.c
clockdomain44xx.c
clockdomains2xxx_3xxx_data.c
clockdomains3xxx_data.c
clockdomains44xx_data.c
clockdomains2420_data.c
clockdomains2430_data.c
cm-regbits-24xx.h
cm-regbits-34xx.h
cm-regbits-44xx.h
cm.h
cm1_44xx.h
cm2_44xx.h
cm2xxx_3xxx.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
cm2xxx_3xxx.h
cm44xx.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
cm44xx.h
cminst44xx.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
cminst44xx.h
common-board-devices.c
common-board-devices.h
common.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
common.h ARM: 7188/1: OMAP2PLUS: Fix build error: 'omap2/omap3_intc_handle_irq' undeclared. 2011-12-05 23:19:50 +00:00
control.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
control.h
cpuidle34xx.c Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable 2011-12-05 23:20:17 +00:00
devices.c
devices.h
display.c ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart changes 2011-12-06 20:27:02 +00:00
display.h ARM: OMAP2PLUS: DSS: Ensure DSS works correctly if display is enabled in bootloader 2011-11-08 03:16:46 -07:00
dma.c
dpll3xxx.c
dpll44xx.c
dsp.c
emu.c
gpio.c
gpmc-nand.c
gpmc-onenand.c
gpmc-smc91x.c
gpmc-smsc911x.c
gpmc.c
hsmmc.c
hsmmc.h
hwspinlock.c
i2c.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
id.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
io.c Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable 2011-12-05 23:27:59 +00:00
iommu2.c
irq.c ARM: omap2plus: remove irq-related global base addresses 2011-11-15 18:14:02 +00:00
Kconfig Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable 2011-12-05 23:20:17 +00:00
mailbox.c
Makefile ARM: OMAP: HWMOD: Unify DSS resets for OMAPs 2011-11-08 03:16:13 -07:00
Makefile.boot
mcbsp.c
mux.c
mux.h
mux34xx.c
mux34xx.h
mux44xx.c
mux44xx.h
mux2420.c
mux2420.h
mux2430.c
mux2430.h
omap-headsmp.S
omap-hotplug.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
omap-iommu.c
omap-smp.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
omap4-common.c Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
omap44xx-smc.S
omap_hwmod.c Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable 2011-12-05 23:20:17 +00:00
omap_hwmod_2xxx_3xxx_interconnect_data.c
omap_hwmod_2xxx_3xxx_ipblock_data.c ARM: OMAP: HWMOD: Unify DSS resets for OMAPs 2011-11-08 03:16:13 -07:00
omap_hwmod_2xxx_interconnect_data.c
omap_hwmod_2xxx_ipblock_data.c
omap_hwmod_3xxx_data.c ARM: OMAP2PLUS: DSS: Ensure DSS works correctly if display is enabled in bootloader 2011-11-08 03:16:46 -07:00
omap_hwmod_44xx_data.c ARM: OMAP2PLUS: DSS: Ensure DSS works correctly if display is enabled in bootloader 2011-11-08 03:16:46 -07:00
omap_hwmod_2420_data.c ARM: OMAP2PLUS: DSS: Ensure DSS works correctly if display is enabled in bootloader 2011-11-08 03:16:46 -07:00
omap_hwmod_2430_data.c ARM: OMAP2PLUS: DSS: Ensure DSS works correctly if display is enabled in bootloader 2011-11-08 03:16:46 -07:00
omap_hwmod_common_data.c ARM: OMAP2PLUS: DSS: Ensure DSS works correctly if display is enabled in bootloader 2011-11-08 03:16:46 -07:00
omap_hwmod_common_data.h ARM: OMAP2PLUS: DSS: Ensure DSS works correctly if display is enabled in bootloader 2011-11-08 03:16:46 -07:00
omap_l3_noc.c ARM: OMAP2+: Fix Compilation error when omap_l3_noc built as module 2011-11-23 14:45:37 -08:00
omap_l3_noc.h
omap_l3_smx.c
omap_l3_smx.h
omap_opp_data.h
omap_phy_internal.c
omap_twl.c
opp.c
opp2xxx.h
opp3xxx_data.c
opp4xxx_data.c
opp2420_data.c
opp2430_data.c
pm-debug.c
pm.c Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable 2011-12-05 23:20:17 +00:00
pm.h
pm24xx.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
pm34xx.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
pm44xx.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
powerdomain-common.c
powerdomain.c
powerdomain.h
powerdomain2xxx_3xxx.c
powerdomain44xx.c
powerdomains2xxx_3xxx_data.c
powerdomains2xxx_3xxx_data.h
powerdomains2xxx_data.c
powerdomains3xxx_data.c
powerdomains44xx_data.c
prcm-common.h
prcm.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
prcm44xx.h
prcm_mpu44xx.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
prcm_mpu44xx.h
prm-regbits-24xx.h
prm-regbits-34xx.h
prm-regbits-44xx.h
prm.h
prm2xxx_3xxx.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
prm2xxx_3xxx.h
prm44xx.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
prm44xx.h
prminst44xx.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
prminst44xx.h
scrm44xx.h
sdram-hynix-h8mbx00u0mer-0em.h
sdram-micron-mt46h32m32lf-6.h
sdram-nokia.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
sdram-nokia.h
sdram-numonyx-m65kxxxxam.h
sdram-qimonda-hyb18m512160af-6.h
sdrc.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
sdrc.h
sdrc2xxx.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
serial.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
sleep24xx.S
sleep34xx.S
smartreflex-class3.c
smartreflex.c Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable 2011-12-05 23:20:17 +00:00
smartreflex.h
sr_device.c
sram34xx.S
sram242x.S
sram243x.S
timer-mpu.c
timer.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
twl-common.c ARM: OMAP: PM: only register TWL with voltage layer when device is present 2011-11-23 14:43:01 -08:00
twl-common.h ARM: OMAP: PM: only register TWL with voltage layer when device is present 2011-11-23 14:43:01 -08:00
usb-fs.c
usb-host.c
usb-musb.c
usb-tusb6010.c
vc.c
vc.h
vc3xxx_data.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
vc44xx_data.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
voltage.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
voltage.h
voltagedomains2xxx_data.c
voltagedomains3xxx_data.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
voltagedomains44xx_data.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
vp.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
vp.h
vp3xxx_data.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
vp44xx_data.c ARM: 7159/1: OMAP: Introduce local common.h files 2011-11-17 17:09:30 +00:00
wd_timer.c
wd_timer.h