diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
tree | 5085c389f09da78182b899d19fe1068b619a69dd /include/linux/cyclades.h | |
parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) |
Merge with 2.3.10.
Diffstat (limited to 'include/linux/cyclades.h')
-rw-r--r-- | include/linux/cyclades.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index 2c127526c..c1c79c96e 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h @@ -517,7 +517,7 @@ struct cyclades_card { int num_chips; /* 0 if card absent, -1 if Z/PCI, else Y */ int first_line; /* minor number of first channel on card */ int bus_index; /* address shift - 0 for ISA, 1 for PCI */ - int inact_ctrl; /* FW Inactivity control - 0 disabled, 1 enabled */ + int intr_enabled; /* FW Interrupt flag - 0 disabled, 1 enabled */ }; struct cyclades_chip { |