From 74e8b5f4c2eaf9b7e080b3567ea0e7c934473ffb Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 17 Sep 2002 06:44:38 -0700 Subject: [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. --- include/linux/cyclades.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include/linux') 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 }; -- cgit v1.2.3