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 'upstream'
[pandora-kernel.git]
/
arch
/
m32r
/
kernel
/
setup_mappi2.c
diff --git
a/arch/m32r/kernel/setup_mappi2.c
b/arch/m32r/kernel/setup_mappi2.c
index
38d5e9a
..
eebc9d8
100644
(file)
--- a/
arch/m32r/kernel/setup_mappi2.c
+++ b/
arch/m32r/kernel/setup_mappi2.c
@@
-3,15
+3,15
@@
*
* Setup routines for Renesas MAPPI-II(M3A-ZA36) Board
*
*
* Setup routines for Renesas MAPPI-II(M3A-ZA36) Board
*
- * Copyright (c) 2001
, 2002
Hiroyuki Kondo, Hirokazu Takata,
- *
Hitoshi Yamamoto, Mamoru Sakugawa
+ * Copyright (c) 2001
-2005
Hiroyuki Kondo, Hirokazu Takata,
+ * Hitoshi Yamamoto, Mamoru Sakugawa
*/
#include <linux/config.h>
#include <linux/irq.h>
#include <linux/kernel.h>
#include <linux/init.h>
*/
#include <linux/config.h>
#include <linux/irq.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/device.h>
+#include <linux/
platform_
device.h>
#include <asm/system.h>
#include <asm/m32r.h>
#include <asm/system.h>
#include <asm/m32r.h>
@@
-19,12
+19,6
@@
#define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long)))
#define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long)))
-#ifndef CONFIG_SMP
-typedef struct {
- unsigned long icucr; /* ICU Control Register */
-} icu_data_t;
-#endif /* CONFIG_SMP */
-
icu_data_t icu_data[NR_IRQS];
static void disable_mappi2_irq(unsigned int irq)
icu_data_t icu_data[NR_IRQS];
static void disable_mappi2_irq(unsigned int irq)