diff options
| author | Mariusz Kozlowski <m.kozlowski@tuxland.pl> | 2009-03-03 19:38:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:53 -0700 |
| commit | e38eb66ec59a9daea689c33bf9330bf7341af1d5 (patch) | |
| tree | 3d7182dfe9bee3aa92afc34389ce6492d00f1e9c | |
| parent | 1b9fb14eb21f86519ce35a2e770a29cd768386a2 (diff) | |
| download | linux-3.10-e38eb66ec59a9daea689c33bf9330bf7341af1d5.tar.gz linux-3.10-e38eb66ec59a9daea689c33bf9330bf7341af1d5.tar.bz2 linux-3.10-e38eb66ec59a9daea689c33bf9330bf7341af1d5.zip | |
Staging: comedi: remove LINUX_VERSION_CODE checks
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: David Schleef <ds@schleef.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h | 18 | ||||
| -rw-r--r-- | drivers/staging/comedi/kcomedilib/ksyms.c | 4 |
2 files changed, 0 insertions, 22 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h b/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h index 95781f8742f..617dc087dcb 100644 --- a/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h +++ b/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h @@ -251,11 +251,7 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display) amcc_devices = NULL; last = NULL; -#if LINUX_VERSION_CODE < 0x020300 - for (pcidev = pci_devices; pcidev; pcidev = pcidev->next) { -#else pci_for_each_dev(pcidev) { -#endif if (pcidev->vendor == pci_vendor) { amcc = kmalloc(sizeof(*amcc), GFP_KERNEL); memset(amcc, 0, sizeof(*amcc)); @@ -268,18 +264,6 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display) } last = amcc; -#if LINUX_VERSION_CODE < 0x020300 - amcc->vendor = pcidev->vendor; - amcc->device = pcidev->device; - amcc->master = pcidev->master; - amcc->pci_bus = pcidev->bus->number; - amcc->pci_slot = PCI_SLOT(pcidev->devfn); - amcc->pci_func = PCI_FUNC(pcidev->devfn); - for (i = 0; i < 5; i++) - amcc->io_addr[i] = - pcidev->base_address[i] & ~3UL; - amcc->irq = pcidev->irq; -#else amcc->vendor = pcidev->vendor; amcc->device = pcidev->device; #if 0 @@ -292,8 +276,6 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display) amcc->io_addr[i] = pcidev->resource[i].start & ~3UL; amcc->irq = pcidev->irq; -#endif - } } diff --git a/drivers/staging/comedi/kcomedilib/ksyms.c b/drivers/staging/comedi/kcomedilib/ksyms.c index 76b45063a9f..3db86dabf87 100644 --- a/drivers/staging/comedi/kcomedilib/ksyms.c +++ b/drivers/staging/comedi/kcomedilib/ksyms.c @@ -40,8 +40,6 @@ #include <linux/mm.h> #include <linux/slab.h> -#if LINUX_VERSION_CODE >= 0x020200 - /* functions specific to kcomedilib */ EXPORT_SYMBOL(comedi_register_callback); @@ -140,5 +138,3 @@ EXPORT_SYMBOL(comedi_get_len_chanlist); /* alpha */ //EXPORT_SYMBOL(comedi_set_global_oor_behavior); - -#endif |