diff options
author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
commit | 05668381140309088443bf5dc53add4104610fbb (patch) | |
tree | ed53039717390e1a71ff16209281b1f1c8d3e6be /arch/arm/mach-iop3xx | |
parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'arch/arm/mach-iop3xx')
-rw-r--r-- | arch/arm/mach-iop3xx/Kconfig | 15 | ||||
-rw-r--r-- | arch/arm/mach-iop3xx/common.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-iop3xx/iop321-setup.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-iop3xx/iop321-time.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop3xx/iop331-setup.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-iop3xx/iop331-time.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/mach-iop3xx/Kconfig b/arch/arm/mach-iop3xx/Kconfig index 2bfe8c729f9f..4422f2388607 100644 --- a/arch/arm/mach-iop3xx/Kconfig +++ b/arch/arm/mach-iop3xx/Kconfig | |||
@@ -30,12 +30,15 @@ config MACH_IQ80332 | |||
30 | select ARCH_IOP331 | 30 | select ARCH_IOP331 |
31 | help | 31 | help |
32 | Say Y here if you want to run your kernel on the Intel IQ80332 | 32 | Say Y here if you want to run your kernel on the Intel IQ80332 |
33 | evaluation kit for the IOP332 chipset | 33 | evaluation kit for the IOP332 chipset. |
34 | 34 | ||
35 | config ARCH_EP80219 | 35 | config ARCH_EP80219 |
36 | bool "Enable support for EP80219" | 36 | bool "Enable support for EP80219" |
37 | select ARCH_IOP321 | 37 | select ARCH_IOP321 |
38 | select ARCH_IQ31244 | 38 | select ARCH_IQ31244 |
39 | help | ||
40 | Say Y here if you want to run your kernel on the Intel EP80219 | ||
41 | evaluation kit for the Intel 80219 chipset (a IOP321 variant). | ||
39 | 42 | ||
40 | # Which IOP variant are we running? | 43 | # Which IOP variant are we running? |
41 | config ARCH_IOP321 | 44 | config ARCH_IOP321 |
@@ -56,8 +59,8 @@ config IOP331_STEPD | |||
56 | bool "Chip stepping D of the IOP80331 processor or IOP80333" | 59 | bool "Chip stepping D of the IOP80331 processor or IOP80333" |
57 | depends on (ARCH_IOP331) | 60 | depends on (ARCH_IOP331) |
58 | help | 61 | help |
59 | Say Y here if you have StepD of the IOP80331 or IOP8033 | 62 | Say Y here if you have StepD of the IOP80331 or IOP8033 |
60 | based platforms. | 63 | based platforms. |
61 | 64 | ||
62 | endmenu | 65 | endmenu |
63 | endif | 66 | endif |
diff --git a/arch/arm/mach-iop3xx/common.c b/arch/arm/mach-iop3xx/common.c index fdeeef489a73..d7f50e57e753 100644 --- a/arch/arm/mach-iop3xx/common.c +++ b/arch/arm/mach-iop3xx/common.c | |||
@@ -12,7 +12,6 @@ | |||
12 | * warranty of any kind, whether express or implied. | 12 | * warranty of any kind, whether express or implied. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/config.h> | ||
16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
17 | #include <asm/hardware.h> | 16 | #include <asm/hardware.h> |
18 | 17 | ||
diff --git a/arch/arm/mach-iop3xx/iop321-setup.c b/arch/arm/mach-iop3xx/iop321-setup.c index 0ebbcb20c6ae..b6d096903c4a 100644 --- a/arch/arm/mach-iop3xx/iop321-setup.c +++ b/arch/arm/mach-iop3xx/iop321-setup.c | |||
@@ -12,7 +12,6 @@ | |||
12 | */ | 12 | */ |
13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/config.h> | ||
16 | #include <linux/major.h> | 15 | #include <linux/major.h> |
17 | #include <linux/fs.h> | 16 | #include <linux/fs.h> |
18 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
diff --git a/arch/arm/mach-iop3xx/iop321-time.c b/arch/arm/mach-iop3xx/iop321-time.c index d67ac0e5d438..04b1a6f7ebae 100644 --- a/arch/arm/mach-iop3xx/iop321-time.c +++ b/arch/arm/mach-iop3xx/iop321-time.c | |||
@@ -85,7 +85,7 @@ iop321_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
85 | static struct irqaction iop321_timer_irq = { | 85 | static struct irqaction iop321_timer_irq = { |
86 | .name = "IOP321 Timer Tick", | 86 | .name = "IOP321 Timer Tick", |
87 | .handler = iop321_timer_interrupt, | 87 | .handler = iop321_timer_interrupt, |
88 | .flags = SA_INTERRUPT | SA_TIMER, | 88 | .flags = IRQF_DISABLED | IRQF_TIMER, |
89 | }; | 89 | }; |
90 | 90 | ||
91 | static void __init iop321_timer_init(void) | 91 | static void __init iop321_timer_init(void) |
diff --git a/arch/arm/mach-iop3xx/iop331-setup.c b/arch/arm/mach-iop3xx/iop331-setup.c index 7b7b6eea3846..3cc98d892ad4 100644 --- a/arch/arm/mach-iop3xx/iop331-setup.c +++ b/arch/arm/mach-iop3xx/iop331-setup.c | |||
@@ -11,7 +11,6 @@ | |||
11 | */ | 11 | */ |
12 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/config.h> | ||
15 | #include <linux/major.h> | 14 | #include <linux/major.h> |
16 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
17 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
diff --git a/arch/arm/mach-iop3xx/iop331-time.c b/arch/arm/mach-iop3xx/iop331-time.c index 3c1f0ebbd636..0c09e74c5740 100644 --- a/arch/arm/mach-iop3xx/iop331-time.c +++ b/arch/arm/mach-iop3xx/iop331-time.c | |||
@@ -82,7 +82,7 @@ iop331_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
82 | static struct irqaction iop331_timer_irq = { | 82 | static struct irqaction iop331_timer_irq = { |
83 | .name = "IOP331 Timer Tick", | 83 | .name = "IOP331 Timer Tick", |
84 | .handler = iop331_timer_interrupt, | 84 | .handler = iop331_timer_interrupt, |
85 | .flags = SA_INTERRUPT | SA_TIMER, | 85 | .flags = IRQF_DISABLED | IRQF_TIMER, |
86 | }; | 86 | }; |
87 | 87 | ||
88 | static void __init iop331_timer_init(void) | 88 | static void __init iop331_timer_init(void) |