Commit 74e8b5f4 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[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.
parent 5383f8ec
...@@ -503,6 +503,7 @@ struct ZFW_CTRL { ...@@ -503,6 +503,7 @@ struct ZFW_CTRL {
#endif #endif
/* Per card data structure */ /* Per card data structure */
struct resource;
struct cyclades_card { struct cyclades_card {
unsigned long base_phys; unsigned long base_phys;
unsigned long ctl_phys; unsigned long ctl_phys;
...@@ -514,10 +515,13 @@ struct cyclades_card { ...@@ -514,10 +515,13 @@ struct cyclades_card {
int nports; /* Number of ports in the card */ int nports; /* Number of ports in the card */
int bus_index; /* address shift - 0 for ISA, 1 for PCI */ int bus_index; /* address shift - 0 for ISA, 1 for PCI */
int intr_enabled; /* FW Interrupt flag - 0 disabled, 1 enabled */ int intr_enabled; /* FW Interrupt flag - 0 disabled, 1 enabled */
struct resource *resource;
unsigned long res_start;
unsigned long res_len;
#ifdef __KERNEL__ #ifdef __KERNEL__
spinlock_t card_lock; spinlock_t card_lock;
#else #else
uclong filler; unsigned long filler;
#endif #endif
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment