git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
arm
/
mach-aaec2000
/
core.c
diff --git
a/arch/arm/mach-aaec2000/core.c
b/arch/arm/mach-aaec2000/core.c
index
baa997c
..
dce4815
100644
(file)
--- a/
arch/arm/mach-aaec2000/core.c
+++ b/
arch/arm/mach-aaec2000/core.c
@@
-9,6
+9,7
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-19,6
+20,7
@@
#include <linux/interrupt.h>
#include <linux/timex.h>
#include <linux/signal.h>
#include <linux/interrupt.h>
#include <linux/timex.h>
#include <linux/signal.h>
+#include <linux/amba/bus.h>
#include <asm/hardware.h>
#include <asm/irq.h>
#include <asm/hardware.h>
#include <asm/irq.h>
@@
-48,12
+50,12
@@
static struct map_desc standard_io_desc[] __initdata = {
{
.virtual = VIO_APB_BASE,
static struct map_desc standard_io_desc[] __initdata = {
{
.virtual = VIO_APB_BASE,
- .p
fn
= __phys_to_pfn(PIO_APB_BASE),
+ .p
hysical
= __phys_to_pfn(PIO_APB_BASE),
.length = IO_APB_LENGTH,
.type = MT_DEVICE
}, {
.virtual = VIO_AHB_BASE,
.length = IO_APB_LENGTH,
.type = MT_DEVICE
}, {
.virtual = VIO_AHB_BASE,
- .p
fn
= __phys_to_pfn(PIO_AHB_BASE),
+ .p
hysical
= __phys_to_pfn(PIO_AHB_BASE),
.length = IO_AHB_LENGTH,
.type = MT_DEVICE
}
.length = IO_AHB_LENGTH,
.type = MT_DEVICE
}
@@
-142,7
+144,7
@@
aaec2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction aaec2000_timer_irq = {
.name = "AAEC-2000 Timer Tick",
static struct irqaction aaec2000_timer_irq = {
.name = "AAEC-2000 Timer Tick",
- .flags =
IRQF_DISABLED | IRQF
_TIMER,
+ .flags =
SA_INTERRUPT | SA
_TIMER,
.handler = aaec2000_timer_interrupt,
};
.handler = aaec2000_timer_interrupt,
};