summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/ebus.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
commitdcec8a13bf565e47942a1751a9cec21bec5648fe (patch)
tree548b69625b18cc2e88c3e68d0923be546c9ebb03 /include/asm-sparc64/ebus.h
parent2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff)
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash. o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'include/asm-sparc64/ebus.h')
-rw-r--r--include/asm-sparc64/ebus.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-sparc64/ebus.h b/include/asm-sparc64/ebus.h
index 4337c0193..333f7affe 100644
--- a/include/asm-sparc64/ebus.h
+++ b/include/asm-sparc64/ebus.h
@@ -1,4 +1,4 @@
-/* $Id: ebus.h,v 1.4 1998/01/10 18:26:08 ecd Exp $
+/* $Id: ebus.h,v 1.5 1998/03/15 10:14:46 ecd Exp $
* ebus.h: PCI to Ebus pseudo driver software state.
*
* Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be)
@@ -42,6 +42,9 @@ struct linux_ebus {
char prom_name[64];
struct linux_prom_ebus_ranges ebus_ranges[PROMREG_MAX];
int num_ebus_ranges;
+ struct linux_prom_ebus_intmap ebus_intmap[PROMREG_MAX];
+ int num_ebus_intmap;
+ struct linux_prom_ebus_intmask ebus_intmask;
};
struct linux_ebus_dma {