diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /arch/arm/mach-iop33x/iq80332.c | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/arm/mach-iop33x/iq80332.c')
| -rw-r--r-- | arch/arm/mach-iop33x/iq80332.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-iop33x/iq80332.c b/arch/arm/mach-iop33x/iq80332.c index 58c81496c6f6..7889ce3cb08e 100644 --- a/arch/arm/mach-iop33x/iq80332.c +++ b/arch/arm/mach-iop33x/iq80332.c | |||
| @@ -55,7 +55,7 @@ static struct sys_timer iq80332_timer = { | |||
| 55 | /* | 55 | /* |
| 56 | * IQ80332 PCI. | 56 | * IQ80332 PCI. |
| 57 | */ | 57 | */ |
| 58 | static inline int __init | 58 | static int __init |
| 59 | iq80332_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 59 | iq80332_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) |
| 60 | { | 60 | { |
| 61 | int irq; | 61 | int irq; |