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
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
mips
/
tx4927
/
toshiba_rbtx4927
/
toshiba_rbtx4927_irq.c
diff --git
a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
index
9303045
..
fd5b433
100644
(file)
--- a/
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ b/
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
@@
-134,10
+134,10
@@
JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
#include <linux/bootmem.h>
#include <linux/blkdev.h>
#ifdef CONFIG_RTC_DS1742
#include <linux/bootmem.h>
#include <linux/blkdev.h>
#ifdef CONFIG_RTC_DS1742
-#include <
asm/rtc_ds1742
.h>
+#include <
linux/ds1742rtc
.h>
#endif
#ifdef CONFIG_TOSHIBA_FPCIB0
#endif
#ifdef CONFIG_TOSHIBA_FPCIB0
-#include <asm/smsc_fdc37m81x.h>
+#include <asm/
tx4927/
smsc_fdc37m81x.h>
#endif
#include <asm/tx4927/toshiba_rbtx4927.h>
#endif
#include <asm/tx4927/toshiba_rbtx4927.h>
@@
-248,7
+248,7
@@
static void toshiba_rbtx4927_irq_isa_mask_and_ack(unsigned int irq);
static void toshiba_rbtx4927_irq_isa_end(unsigned int irq);
#endif
static void toshiba_rbtx4927_irq_isa_end(unsigned int irq);
#endif
-static
spinlock_t toshiba_rbtx4927_ioc_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(toshiba_rbtx4927_ioc_lock)
;
#define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC"
#define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC"
@@
-665,11
+665,11
@@
static void toshiba_rbtx4927_irq_isa_end(unsigned int irq)
#endif
#endif
-void __init
init_IRQ
(void)
+void __init
arch_init_irq
(void)
{
extern void tx4927_irq_init(void);
{
extern void tx4927_irq_init(void);
-
cli
();
+
local_irq_disable
();
tx4927_irq_init();
toshiba_rbtx4927_irq_ioc_init();
tx4927_irq_init();
toshiba_rbtx4927_irq_ioc_init();
@@
-681,13
+681,6
@@
void __init init_IRQ(void)
}
#endif
}
#endif
-#ifdef CONFIG_PCI
- {
- extern void toshiba_rbtx4927_pci_irq_init(void);
- toshiba_rbtx4927_pci_irq_init();
- }
-#endif
-
wbflush();
return;
wbflush();
return;