diff options
| -rw-r--r-- | drivers/char/cyclades.c | 8 | ||||
| -rw-r--r-- | include/linux/cyclades.h | 15 |
2 files changed, 2 insertions, 21 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index 249f443115f..1b4ff138b8f 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c @@ -4049,14 +4049,6 @@ cy_ioctl(struct tty_struct *tty, struct file *file, case CYGETRTSDTR_INV: ret_val = info->rtsdtr_inv; break; - case CYGETCARDINFO: - if (copy_to_user(argp, &cy_card[info->card], - sizeof(struct cyclades_card))) { - ret_val = -EFAULT; - break; - } - ret_val = 0; - break; case CYGETCD1400VER: ret_val = info->chip_rev; break; diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index f0ad61f6979..e76f486550c 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h @@ -110,7 +110,6 @@ struct cyclades_idle_stats { #define CYZSETPOLLCYCLE 0x43590e #define CYZGETPOLLCYCLE 0x43590f #define CYGETCD1400VER 0x435910 -#define CYGETCARDINFO 0x435911 #define CYSETWAIT 0x435912 #define CYGETWAIT 0x435913 @@ -506,8 +505,9 @@ struct ZFW_CTRL { /****************** ****************** *******************/ #endif +#ifdef __KERNEL__ + /* Per card data structure */ -struct resource; struct cyclades_card { unsigned long base_phys; unsigned long ctl_phys; @@ -520,20 +520,9 @@ struct cyclades_card { int bus_index; /* address shift - 0 for ISA, 1 for PCI */ int intr_enabled; /* FW Interrupt flag - 0 disabled, 1 enabled */ struct pci_dev *pdev; -#ifdef __KERNEL__ spinlock_t card_lock; -#else - unsigned long filler; -#endif }; -struct cyclades_chip { - int filler; -}; - - -#ifdef __KERNEL__ - /*************************************** * Memory access functions/macros * * (required to support Alpha systems) * |