diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/cyclades.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index f0ad61f69792..e76f486550c6 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h | |||
@@ -110,7 +110,6 @@ struct cyclades_idle_stats { | |||
110 | #define CYZSETPOLLCYCLE 0x43590e | 110 | #define CYZSETPOLLCYCLE 0x43590e |
111 | #define CYZGETPOLLCYCLE 0x43590f | 111 | #define CYZGETPOLLCYCLE 0x43590f |
112 | #define CYGETCD1400VER 0x435910 | 112 | #define CYGETCD1400VER 0x435910 |
113 | #define CYGETCARDINFO 0x435911 | ||
114 | #define CYSETWAIT 0x435912 | 113 | #define CYSETWAIT 0x435912 |
115 | #define CYGETWAIT 0x435913 | 114 | #define CYGETWAIT 0x435913 |
116 | 115 | ||
@@ -506,8 +505,9 @@ struct ZFW_CTRL { | |||
506 | /****************** ****************** *******************/ | 505 | /****************** ****************** *******************/ |
507 | #endif | 506 | #endif |
508 | 507 | ||
508 | #ifdef __KERNEL__ | ||
509 | |||
509 | /* Per card data structure */ | 510 | /* Per card data structure */ |
510 | struct resource; | ||
511 | struct cyclades_card { | 511 | struct cyclades_card { |
512 | unsigned long base_phys; | 512 | unsigned long base_phys; |
513 | unsigned long ctl_phys; | 513 | unsigned long ctl_phys; |
@@ -520,20 +520,9 @@ struct cyclades_card { | |||
520 | int bus_index; /* address shift - 0 for ISA, 1 for PCI */ | 520 | int bus_index; /* address shift - 0 for ISA, 1 for PCI */ |
521 | int intr_enabled; /* FW Interrupt flag - 0 disabled, 1 enabled */ | 521 | int intr_enabled; /* FW Interrupt flag - 0 disabled, 1 enabled */ |
522 | struct pci_dev *pdev; | 522 | struct pci_dev *pdev; |
523 | #ifdef __KERNEL__ | ||
524 | spinlock_t card_lock; | 523 | spinlock_t card_lock; |
525 | #else | ||
526 | unsigned long filler; | ||
527 | #endif | ||
528 | }; | 524 | }; |
529 | 525 | ||
530 | struct cyclades_chip { | ||
531 | int filler; | ||
532 | }; | ||
533 | |||
534 | |||
535 | #ifdef __KERNEL__ | ||
536 | |||
537 | /*************************************** | 526 | /*************************************** |
538 | * Memory access functions/macros * | 527 | * Memory access functions/macros * |
539 | * (required to support Alpha systems) * | 528 | * (required to support Alpha systems) * |