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/linville/wirel...
[pandora-kernel.git]
/
arch
/
sh
/
include
/
mach-landisk
/
mach
/
iodata_landisk.h
diff --git
a/arch/sh/include/mach-landisk/mach/iodata_landisk.h
b/arch/sh/include/mach-landisk/mach/iodata_landisk.h
index
6fb04ab
..
f432773
100644
(file)
--- a/
arch/sh/include/mach-landisk/mach/iodata_landisk.h
+++ b/
arch/sh/include/mach-landisk/mach/iodata_landisk.h
@@
-2,7
+2,7
@@
#define __ASM_SH_IODATA_LANDISK_H
/*
#define __ASM_SH_IODATA_LANDISK_H
/*
- *
linux/include/asm-sh/landisk
/iodata_landisk.h
+ *
arch/sh/include/mach-landisk/mach
/iodata_landisk.h
*
* Copyright (C) 2000 Atom Create Engineering Co., Ltd.
*
*
* Copyright (C) 2000 Atom Create Engineering Co., Ltd.
*
@@
-27,7
+27,7
@@
#define IRQ_PCIINTA 5 /* PCI INTA IRQ */
#define IRQ_PCIINTB 6 /* PCI INTB IRQ */
#define IRQ_PCIINTA 5 /* PCI INTA IRQ */
#define IRQ_PCIINTB 6 /* PCI INTB IRQ */
-#define IRQ_PCIIN
D
C 7 /* PCI INTC IRQ */
+#define IRQ_PCIIN
T
C 7 /* PCI INTC IRQ */
#define IRQ_PCIINTD 8 /* PCI INTD IRQ */
#define IRQ_ATA 9 /* ATA IRQ */
#define IRQ_FATA 10 /* FATA IRQ */
#define IRQ_PCIINTD 8 /* PCI INTD IRQ */
#define IRQ_ATA 9 /* ATA IRQ */
#define IRQ_FATA 10 /* FATA IRQ */
@@
-35,6
+35,8
@@
#define IRQ_BUTTON 12 /* USL-5P Button IRQ */
#define IRQ_FAULT 13 /* USL-5P Fault IRQ */
#define IRQ_BUTTON 12 /* USL-5P Button IRQ */
#define IRQ_FAULT 13 /* USL-5P Fault IRQ */
+void init_landisk_IRQ(void);
+
#define __IO_PREFIX landisk
#include <asm/io_generic.h>
#define __IO_PREFIX landisk
#include <asm/io_generic.h>