summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMarc Zyngier <mzyngier@freesurf.fr>2003-04-28 13:33:28 -0700
committerAnton Altaparmakov <aia21@cantab.net>2003-04-28 13:33:28 -0700
commita00ad804b754d5b3afc42ec95413dc2450903b51 (patch)
tree7acc0b53d28a6b57a663f3b4a25c14d3449776bb /include/linux
parenta0e259f3f8e6884f70699f3dd2d4d3ec6ef9be76 (diff)
[PATCH] EISA/sysfs update
The included patch cleans up the EISA code : - Documentation update, - Remove i386 EISA ID reservation (handled in the generic code), - Add some preliminary support for EISA-like VLB cards (Adaptec 287x), - Add some stricter dependancies for EISA_VIRTUAL_ROOT - Preliminary support for EISA DMA, - Much more conservative probing, - EISA IDs list update (Compaq stuff).
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/eisa.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/eisa.h b/include/linux/eisa.h
index 27bf30e7699e..d77fdf0f9f01 100644
--- a/include/linux/eisa.h
+++ b/include/linux/eisa.h
@@ -25,13 +25,15 @@ struct eisa_device_id {
};
/* There is not much we can say about an EISA device, apart from
- * signature, slot number, and base address. */
+ * signature, slot number, and base address. dma_mask is set by
+ * default to 32 bits.*/
struct eisa_device {
struct eisa_device_id id;
int slot;
unsigned long base_addr;
struct resource res;
+ u64 dma_mask;
struct device dev; /* generic device */
};
@@ -63,12 +65,12 @@ static inline void eisa_set_drvdata (struct eisa_device *edev, void *data)
* busses (PA-RISC ?), so we try to handle that. */
struct eisa_root_device {
- struct list_head node;
struct device *dev; /* Pointer to bridge device */
struct resource *res;
unsigned long bus_base_addr;
int slots; /* Max slot number */
int bus_nr; /* Set by eisa_root_register */
+ struct resource eisa_root_res; /* ditto */
};
int eisa_root_register (struct eisa_root_device *root);