diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 19:52:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 19:52:10 -0500 |
| commit | 7420b73dc05ae1faa36b49774210a13d29349c53 (patch) | |
| tree | 90cdba18724099353598e69b3ee9ee21df9582cf /arch/arm/mach-msm/board-halibut.c | |
| parent | 3e1c4005134e3a090c64c1bc35f965043bb451f4 (diff) | |
| parent | de8696203e64f19ea26f8e096ac8a796e78216b3 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
NVRAM depends on RTC_DRV_CMOS
rename platform_driver name "flash" to "sa1100-mtd"
annotate that [fp, #-4] is the saved lr
Use __SPIN_LOCK_UNLOCKED to initialize bad_irq_desc.lock
ARM: OMAP: fix fault in enter_full_retention()
ARM: OMAP: Mask interrupts when disabling interrupts, v2
ARM: OMAP: gptimer min_delta_ns corrected
ARM: OMAP: Fix hsmmc init, v2
ARM: OMAP: Fix omap34xx revision detection for ES3.1
ARM: OMAP: DMA: Fix uninitialized channel flags
ARM: OMAP: Fix race in OMAP2/3 DMA IRQ handling
ARM: OMAP: Fix McBSP spin_lock deadlock
[ARM] 5366/1: fix shared memory coherency with VIVT L1 + L2 caches
[ARM] call undefined instruction exception handler with irqs enabled
[ARM] msm: fix build errors
[ARM] etherh: continue fixing build failure
Diffstat (limited to 'arch/arm/mach-msm/board-halibut.c')
| -rw-r--r-- | arch/arm/mach-msm/board-halibut.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c index c2a96e3965a..e61967dde9a 100644 --- a/arch/arm/mach-msm/board-halibut.c +++ b/arch/arm/mach-msm/board-halibut.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <asm/mach/map.h> | 27 | #include <asm/mach/map.h> |
| 28 | #include <asm/mach/flash.h> | 28 | #include <asm/mach/flash.h> |
| 29 | 29 | ||
| 30 | #include <mach/irqs.h> | ||
| 30 | #include <mach/board.h> | 31 | #include <mach/board.h> |
| 31 | #include <mach/msm_iomap.h> | 32 | #include <mach/msm_iomap.h> |
| 32 | 33 | ||