git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
xcep.c
diff --git
a/arch/arm/mach-pxa/xcep.c
b/arch/arm/mach-pxa/xcep.c
index
f55f8f2
..
acc600f
100644
(file)
--- a/
arch/arm/mach-pxa/xcep.c
+++ b/
arch/arm/mach-pxa/xcep.c
@@
-28,8
+28,7
@@
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <asm/mach/map.h>
#include <mach/hardware.h>
-#include <mach/pxa2xx-regs.h>
-#include <mach/mfp-pxa25x.h>
+#include <mach/pxa25x.h>
#include <mach/smemc.h>
#include "generic.h"
#include <mach/smemc.h>
#include "generic.h"
@@
-185,6
+184,7
@@
MACHINE_START(XCEP, "Iskratel XCEP")
.init_machine = xcep_init,
.map_io = pxa25x_map_io,
.init_irq = pxa25x_init_irq,
.init_machine = xcep_init,
.map_io = pxa25x_map_io,
.init_irq = pxa25x_init_irq,
+ .handle_irq = pxa25x_handle_irq,
.timer = &pxa_timer,
MACHINE_END
.timer = &pxa_timer,
MACHINE_END