diff options
| author | Adrian Bunk <bunk@fs.tum.de> | 2002-09-17 06:44:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-17 06:44:38 -0700 |
| commit | 74e8b5f4c2eaf9b7e080b3567ea0e7c934473ffb (patch) | |
| tree | e6c0a73da5a6201d19e6f4b91a2660318c5b3f18 /include/linux | |
| parent | 5383f8ec668d56a559c7911f81425a45813304cb (diff) | |
[PATCH] fix cyclades.c compile error
cyclades.c doesn't compile cleanly: the problem is that older -dj
patches contained patches to both cyclades.c and cyclades.h but only the
former one went into your tree. This syncs up the header file too.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cyclades.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index 7452d838d891..0fe53b96a2e4 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h @@ -503,6 +503,7 @@ struct ZFW_CTRL { #endif /* Per card data structure */ +struct resource; struct cyclades_card { unsigned long base_phys; unsigned long ctl_phys; @@ -514,10 +515,13 @@ struct cyclades_card { int nports; /* Number of ports in the card */ int bus_index; /* address shift - 0 for ISA, 1 for PCI */ int intr_enabled; /* FW Interrupt flag - 0 disabled, 1 enabled */ + struct resource *resource; + unsigned long res_start; + unsigned long res_len; #ifdef __KERNEL__ spinlock_t card_lock; #else - uclong filler; + unsigned long filler; #endif }; |