lkml.org 
[lkml]   [2003]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH] PCI changes and fixes for 2.5.72
    From
    Date
    ChangeSet 1.1327.5.3, 2003/06/18 14:56:52-07:00, davidm@napali.hpl.hp.com

    [PATCH] PCI: move pci_domain_nr() inside "#ifdef CONFIG_PCI" bracket

    Trivial build fix: pci_domain_nr() cannot be declared unless
    CONFIG_PCI is defined (otherwise, struct pci_bus hasn't been defined).


    include/linux/pci.h | 19 +++++++++----------
    1 files changed, 9 insertions(+), 10 deletions(-)


    diff -Nru a/include/linux/pci.h b/include/linux/pci.h
    --- a/include/linux/pci.h Thu Jun 19 16:32:17 2003
    +++ b/include/linux/pci.h Thu Jun 19 16:32:17 2003
    @@ -743,6 +743,15 @@
    return rc;
    }

    +/*
    + * PCI domain support. Sometimes called PCI segment (eg by ACPI),
    + * a PCI domain is defined to be a set of PCI busses which share
    + * configuration space.
    + */
    +#ifndef CONFIG_PCI_DOMAINS
    +static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }
    +#endif
    +
    #endif /* !CONFIG_PCI */

    /* these helpers provide future and backwards compatibility
    @@ -799,16 +808,6 @@
    #define PCIPCI_VIAETBF 8
    #define PCIPCI_VSFX 16
    #define PCIPCI_ALIMAGIK 32
    -
    -/*
    - * PCI domain support. Sometimes called PCI segment (eg by ACPI),
    - * a PCI domain is defined to be a set of PCI busses which share
    - * configuration space.
    - */
    -
    -#ifndef CONFIG_PCI_DOMAINS
    -static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }
    -#endif

    #endif /* __KERNEL__ */
    #endif /* LINUX_PCI_H */
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 13:36    [W:4.295 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site