q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/arm/mach-omap2/include/mach
History
Russell King 2d13ccaa87 Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 
Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/include/mach/omap4-common.h
	arch/arm/plat-omap/include/plat/irqs.h

The changes to omap4-common.h were moved to arch/arm/mach-omap2/common.h
and the other trivial conflicts resolved.  The now empty ifdef in irqs.h
was also eliminated.
2011-11-21 21:56:56 +00:00
..
am35xx.h AM35xx EMAC: define submodule offsets 2010-05-20 10:53:55 -07:00
board-rx51.h OMAP2plus: Fix static function warnings 2010-10-08 10:02:49 -07:00
board-zoom.h OMAP: DSS2: Move display.h to include/video/ 2011-05-11 14:05:07 +03:00
ctrl_module_core_44xx.h omap4: control: Add the register definition headers 2010-09-27 14:02:58 -06:00
ctrl_module_pad_core_44xx.h ARM: OMAP: ctrl: Fix CONTROL_DSIPHY register fields 2011-10-07 03:08:44 -06:00
ctrl_module_pad_wkup_44xx.h omap4: control: Add the register definition headers 2010-09-27 14:02:58 -06:00
ctrl_module_wkup_44xx.h omap4: control: Add the register definition headers 2010-09-27 14:02:58 -06:00
debug-macro.S ARM: mach-omap2: clean up debug-macro.S 2011-09-26 10:11:27 -04:00
entry-macro.S ARM: omap2plus: convert to CONFIG_MULTI_IRQ_HANDLER 2011-11-15 18:14:02 +00:00
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
id.h omap: Add new interface omap_get_die_id 2010-08-02 14:21:41 +03: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
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: 6484/1: fix compile warning in mm/init.c 2010-11-21 22:05:56 +00:00