diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-04 19:51:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-04 19:51:58 -0500 |
commit | 005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5 (patch) | |
tree | bc3ef1b64dcdb48b2d6accb51951a0d73b33262e /arch/arm/mach-msm/board-halibut.c | |
parent | 4d7902f22b0804730b80f7a4147f676430248a3a (diff) | |
parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 c2a96e3965a6..e61967dde9a1 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 | ||