kevin/linux
1
Fork 0
Code
c312659c5f
linux/arch/arm/mach-omap1
History
Linus Torvalds ac0f6f927d Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)
  ARM: Eliminate decompressor -Dstatic= PIC hack
  ARM: 5958/1: ARM: U300: fix inverted clk round rate
  ARM: 5956/1: misplaced parentheses
  ARM: 5955/1: ep93xx: move timer defines into core.c and document
  ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c
  ARM: 5953/1: ep93xx: fix broken build of clock.c
  ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig
  ARM: 5949/1: NUC900 add gpio virtual memory map
  ARM: 5948/1: Enable timer0 to time4 clock support for nuc910
  ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk
  ARM: make_coherent(): fix problems with highpte, part 2
  MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself
  ARM: 5945/1: ep93xx: include correct irq.h in core.c
  ARM: 5933/1: amba-pl011: support hardware flow control
  ARM: 5930/1: Add PKMAP area description to memory.txt.
  ARM: 5929/1: Add checks to detect overlap of memory regions.
  ARM: 5928/1: Change type of VMALLOC_END to unsigned long.
  ARM: 5927/1: Make delimiters of DMA area globally visibly.
  ARM: 5926/1: Add "Virtual kernel memory..." printout.
  ARM: 5920/1: OMAP4: Enable L2 Cache
  ...

Fix up trivial conflict in arch/arm/mach-mx25/clock.c
2010-03-01 09:15:15 -08:00
..
include/mach ARM: 5910/1: ARM: Add tmp register for addruart and loadsp 2010-02-12 17:27:52 +00:00
board-ams-delta.c Merge branch '7xx-iosplit-plat' with omap-fixes 2009-11-10 18:10:34 -08:00
board-fsample.c omap1: Use gen_nand 2009-12-11 16:16:33 -08:00
board-generic.c Merge branch '7xx-iosplit-plat' with omap-fixes 2009-11-10 18:10:34 -08:00
board-h2-mmc.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
board-h2.c omap1: Use gen_nand 2009-12-11 16:16:33 -08:00
board-h2.h ARM: OMAP: No need to include board-h2.h from hardware.h 2009-03-23 18:07:33 -07:00
board-h3-mmc.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
board-h3.c omap1: Use gen_nand 2009-12-11 16:16:33 -08:00
board-h3.h ARM: OMAP: No need to include board-h3.h from hardware.h 2009-03-23 18:07:33 -07:00
board-htcherald.c omap1: Add omap7xx USB support 2009-12-11 16:16:34 -08:00
board-innovator.c omap: use smc91x_platdata to setup smc91x 2009-12-11 16:16:33 -08:00
board-nokia770.c OMAP: OMAPFB: split omapfb.h 2009-12-09 12:04:06 +02:00
board-osk.c omap: use smc91x_platdata to setup smc91x 2009-12-11 16:16:33 -08:00
board-palmte.c Merge branch '7xx-iosplit-plat' with omap-fixes 2009-11-10 18:10:34 -08:00
board-palmtt.c Merge branch '7xx-iosplit-plat' with omap-fixes 2009-11-10 18:10:34 -08:00
board-palmz71.c Merge branch '7xx-iosplit-plat' with omap-fixes 2009-11-10 18:10:34 -08:00
board-perseus2.c omap1: Use gen_nand 2009-12-11 16:16:33 -08:00
board-sx1-mmc.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
board-sx1.c Merge branch '7xx-iosplit-plat' with omap-fixes 2009-11-10 18:10:34 -08:00
board-voiceblue.c omap: use smc91x_platdata to setup smc91x 2009-12-11 16:16:33 -08:00
clock_data.c Merge branch 'for_2.6.33rc_c' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus 2010-01-08 14:27:56 -08:00
clock.c OMAP1 clock: fix for "BUG: spinlock lockup on CPU#0" 2010-01-20 13:35:28 -07:00
clock.h OMAP1 clock: convert mach-omap1/clock.h to mach-omap1/clock_data.c 2009-12-11 17:00:40 -07:00
devices.c omap1: Add 7xx clocks and pin muxes for SPI 2010-01-08 10:29:05 -08:00
fpga.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
i2c.c omap1: I2C mux and clocks for omap7xx 2009-12-11 16:16:34 -08:00
id.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
io.c OMAP1 clock: convert mach-omap1/clock.h to mach-omap1/clock_data.c 2009-12-11 17:00:40 -07:00
irq.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
Kconfig omap1: Add board support and LCD for HTC Herald 2009-11-22 10:24:33 -08:00
lcd_dma.c omap1: LCD_DMA: Use some define rather than a hexadecimal 2009-12-11 16:16:36 -08:00
leds-h2p2-debug.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
leds-innovator.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-osk.c ARM: OMAP: switch to standard gpio get/set calls 2008-12-10 17:35:25 -08:00
leds.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
leds.h
mailbox.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
Makefile omap1: DMA: move LCD related code from plat-omap to mach-omap1 2009-12-11 16:16:33 -08:00
Makefile.boot
mcbsp.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
mux.c omap1: Add 7xx clocks and pin muxes for SPI 2010-01-08 10:29:05 -08:00
opp_data.c OMAP1 clock: convert mach-omap1/clock.h to mach-omap1/clock_data.c 2009-12-11 17:00:40 -07:00
opp.h OMAP1 clock: convert mach-omap1/clock.h to mach-omap1/clock_data.c 2009-12-11 17:00:40 -07:00
pm.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
pm.h OMAP850: PM: Add an ARCH_OMAP850 check 2009-10-07 23:14:08 +01:00
serial.c omap: Eliminate OMAP_MAX_NR_PORTS 2009-11-22 10:24:32 -08:00
sleep.S OMAP7XX: Rename all the rest of the omap730 references in omap1 core 2009-10-07 23:14:06 +01:00
sram.S OMAP: Remove OMAP_IO_ADDRESS, use OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS instead 2009-08-28 10:50:33 -07:00
time.c OMAP: Remove OMAP_IO_ADDRESS, use OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS instead 2009-08-28 10:50:33 -07:00
timer32k.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00