Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c2e221e8b93ea54da85d9b5413a2eff9f4a653f7
Commit:     c2e221e8b93ea54da85d9b5413a2eff9f4a653f7
Parent:     3f1df7a260aded4937e512872f3fbfdb9bc22c82
Author:     Linas Vepstas <[EMAIL PROTECTED]>
AuthorDate: Wed May 23 04:18:04 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Thu Jun 14 22:29:55 2007 +1000

    [POWERPC] pseries: asm/pci-bridge.h CONFIG_ minor cleanup
    
    Use the correct CONFIG_ option to mark off the EEH bits.
    Move the EEH bits to the bottom of the struct.
    The config_space array is used by EEH only; it does not
    need to be part of the struct for non-pseries machines.
    
    Signed-off-by: Linas Vepstas <[EMAIL PROTECTED]>
    
    ----
    Revised patch, per commments from Michael Ellerman.
    
     include/asm-powerpc/pci-bridge.h |   16 +++++++++-------
     1 file changed, 9 insertions(+), 7 deletions(-)
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 include/asm-powerpc/pci-bridge.h |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h
index d9bf5ab..11537a0 100644
--- a/include/asm-powerpc/pci-bridge.h
+++ b/include/asm-powerpc/pci-bridge.h
@@ -70,19 +70,21 @@ struct pci_dn {
        int     devfn;                  /* pci device and function number */
        int     class_code;             /* pci device class */
 
-#ifdef CONFIG_PPC_PSERIES
+       struct  pci_controller *phb;    /* for pci devices */
+       struct  iommu_table *iommu_table;       /* for phb's or bridges */
+       struct  pci_dev *pcidev;        /* back-pointer to the pci device */
+       struct  device_node *node;      /* back-pointer to the device_node */
+
+       int     pci_ext_config_space;   /* for pci devices */
+
+#ifdef CONFIG_EEH
        int     eeh_mode;               /* See eeh.h for possible EEH_MODEs */
        int     eeh_config_addr;
        int     eeh_pe_config_addr; /* new-style partition endpoint address */
        int     eeh_check_count;        /* # times driver ignored error */
        int     eeh_freeze_count;       /* # times this device froze up. */
-#endif
-       int     pci_ext_config_space;   /* for pci devices */
-       struct  pci_controller *phb;    /* for pci devices */
-       struct  iommu_table *iommu_table;       /* for phb's or bridges */
-       struct  pci_dev *pcidev;        /* back-pointer to the pci device */
-       struct  device_node *node;      /* back-pointer to the device_node */
        u32     config_space[16];       /* saved PCI config space */
+#endif
 };
 
 /* Get the pointer to a device_node's pci_dn */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to