git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
[safe/jmp/linux-2.6]
/
arch
/
m68k
/
include
/
asm
/
amigayle.h
diff --git
a/arch/m68k/include/asm/amigayle.h
b/arch/m68k/include/asm/amigayle.h
index
bb5a6aa
..
a01453d
100644
(file)
--- a/
arch/m68k/include/asm/amigayle.h
+++ b/
arch/m68k/include/asm/amigayle.h
@@
-104,4
+104,10
@@
struct GAYLE {
#define GAYLE_CFG_250NS 0x00
#define GAYLE_CFG_720NS 0x0c
+struct gayle_ide_platform_data {
+ unsigned long base;
+ unsigned long irqport;
+ int explicit_ack; /* A1200 IDE needs explicit ack */
+};
+
#endif /* asm-m68k/amigayle.h */