diff options
| author | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:35:24 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:35:24 -0400 |
| commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
| tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /arch/ia64/sn/pci/pcibr/pcibr_provider.c | |
| parent | d186b86ffcad713a1dd3d03e9d4ce2d59f61a1ed (diff) | |
| parent | e088a4ad7fa53c3dc3c29f930025f41ccf01953e (diff) | |
Pull for-2.6.31 into release
Diffstat (limited to 'arch/ia64/sn/pci/pcibr/pcibr_provider.c')
| -rw-r--r-- | arch/ia64/sn/pci/pcibr/pcibr_provider.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c index 2c676cc05418..d13e5a22a558 100644 --- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c +++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c | |||
| @@ -79,7 +79,7 @@ static int sal_pcibr_error_interrupt(struct pcibus_info *soft) | |||
| 79 | 79 | ||
| 80 | u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus) | 80 | u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus) |
| 81 | { | 81 | { |
| 82 | s64 rc; | 82 | long rc; |
| 83 | u16 uninitialized_var(ioboard); /* GCC be quiet */ | 83 | u16 uninitialized_var(ioboard); /* GCC be quiet */ |
| 84 | nasid_t nasid = NASID_GET(SN_PCIBUS_BUSSOFT(pci_bus)->bs_base); | 84 | nasid_t nasid = NASID_GET(SN_PCIBUS_BUSSOFT(pci_bus)->bs_base); |
| 85 | 85 | ||