diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-07-09 22:49:03 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-07-09 22:51:53 +0200 |
| commit | dcf5bfa4f588a97110d52ce7de74ec4633f74461 (patch) | |
| tree | 76777e3826e1ca6b02c31985f0dcad5e0c15e2ca /linux/pcmcia-cs/modules/pci_fixup.c | |
| parent | 19283fdffa782b2e485ef39e0de1574006ec4a1a (diff) | |
| parent | 6cd23e1aa4f3557260e0cf75a2de2c142f8d8f48 (diff) | |
Merge branch 'master-user_level_drivers' into master-user_level_drivers-debian
Diffstat (limited to 'linux/pcmcia-cs/modules/pci_fixup.c')
| -rw-r--r-- | linux/pcmcia-cs/modules/pci_fixup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/pcmcia-cs/modules/pci_fixup.c b/linux/pcmcia-cs/modules/pci_fixup.c index 3b5551ad..6cbcd03e 100644 --- a/linux/pcmcia-cs/modules/pci_fixup.c +++ b/linux/pcmcia-cs/modules/pci_fixup.c @@ -51,7 +51,6 @@ u32 pci_irq_mask = 0; #ifndef MACH /* Already defined in drivers/pci/pci.c. */ struct pci_dev *pci_devices = NULL; -#endif struct pci_bus pci_root = { parent: NULL, children: NULL, @@ -61,6 +60,7 @@ struct pci_bus pci_root = { number: 0 }; #endif +#endif #if (LINUX_VERSION_CODE < VERSION(2,1,93)) |