diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:01:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:01:25 -0400 |
| commit | d7f6884ae0ae6e406ec3500fcde16e8f51642460 (patch) | |
| tree | efceb246a4fa12921b7dbd3946a88fa257684405 /arch/ppc/syslib/qspan_pci.c | |
| parent | cd28ab6a4e50a7601d22752aa7ce0c8197b10bdf (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ppc/syslib/qspan_pci.c')
| -rw-r--r-- | arch/ppc/syslib/qspan_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/qspan_pci.c b/arch/ppc/syslib/qspan_pci.c index 57f4ed5e5ae1..0970b5d30391 100644 --- a/arch/ppc/syslib/qspan_pci.c +++ b/arch/ppc/syslib/qspan_pci.c | |||
| @@ -94,7 +94,7 @@ | |||
| 94 | #define mk_config_type1(bus, dev, offset) \ | 94 | #define mk_config_type1(bus, dev, offset) \ |
| 95 | mk_config_addr(bus, dev, offset) | 1; | 95 | mk_config_addr(bus, dev, offset) | 1; |
| 96 | 96 | ||
| 97 | static spinlock_t pcibios_lock = SPIN_LOCK_UNLOCKED; | 97 | static DEFINE_SPINLOCK(pcibios_lock); |
| 98 | 98 | ||
| 99 | int qspan_pcibios_read_config_byte(unsigned char bus, unsigned char dev_fn, | 99 | int qspan_pcibios_read_config_byte(unsigned char bus, unsigned char dev_fn, |
| 100 | unsigned char offset, unsigned char *val) | 100 | unsigned char offset, unsigned char *val) |