diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2002-11-19 19:36:03 +0000 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2002-11-19 19:36:03 +0000 |
| commit | 48d7217f40fd5ecdbce67f3668b01e2182c6aefd (patch) | |
| tree | 614a5acdab0749343a8e49c1bc57f0121c851af4 | |
| parent | 80ffbe9fa27c6ed3f429172ce6670a0725b12af8 (diff) | |
[ARM] 2.5.48 Build fixes (round 2)
This cset fixes various PCI and FPA11 FPE related build warnings and
errors resulting from changes from 2.5.47 to 2.5.48.
| -rw-r--r-- | arch/arm/kernel/bios32.c | 6 | ||||
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-footbridge/netwinder-pci.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/pci_v3.c | 2 | ||||
| -rw-r--r-- | arch/arm/nwfpe/fpa11.c | 1 |
5 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index df25c41f890c..d60b6347b893 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -270,7 +270,7 @@ pcibios_update_resource(struct pci_dev *dev, struct resource *root, if (debug_pci) printk("PCI: Assigning %3s %08lx to %s\n", res->flags & IORESOURCE_IO ? "IO" : "MEM", - res->start, dev->name); + res->start, dev->dev.name); if (resource < 6) { reg = PCI_BASE_ADDRESS_0 + 4*resource; @@ -303,7 +303,7 @@ pcibios_update_resource(struct pci_dev *dev, struct resource *root, void __devinit pcibios_update_irq(struct pci_dev *dev, int irq) { if (debug_pci) - printk("PCI: Assigning IRQ %02d to %s\n", irq, dev->name); + printk("PCI: Assigning IRQ %02d to %s\n", irq, dev->dev.name); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); } @@ -642,7 +642,7 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, enum pci_mmap_state mmap_state, int write_combine) { struct pci_sys_data *root = dev->sysdata; - unsigned long prot, phys; + unsigned long phys; if (mmap_state == pci_mmap_io) { return -EINVAL; diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 33cf0ca2b347..72245e91600c 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -193,7 +193,7 @@ irq_prio_ld: .byte 40,40,41,40,42,42,42,42,43,43,43,43,43,43,43,43 mov \irqstat, #0x0C strb \irqstat, [r4, #0x20] @outb(0x0C, 0x20) /* Poll command */ - ldrb \irqnr, [r4, #0x10] @irq = inb(0x20) & 7 + ldrb \irqnr, [r4, #0x20] @irq = inb(0x20) & 7 and \irqstat, \irqnr, #0x80 teq \irqstat, #0 beq 43f diff --git a/arch/arm/mach-footbridge/netwinder-pci.c b/arch/arm/mach-footbridge/netwinder-pci.c index 7f67df2300aa..a5a1bc5a4d6f 100644 --- a/arch/arm/mach-footbridge/netwinder-pci.c +++ b/arch/arm/mach-footbridge/netwinder-pci.c @@ -37,7 +37,7 @@ static int __init netwinder_map_irq(struct pci_dev *dev, u8 slot, u8 pin) default: printk(KERN_ERR "PCI: unknown device in slot %s: %s\n", - dev->slot_name, dev->name); + dev->slot_name, dev->dev.name); return 0; } } diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index 2abfa3b524d5..71aa96175a09 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c @@ -379,7 +379,7 @@ static int __init pci_v3_setup_resources(struct resource **resource) */ resource[0] = &ioport_resource; resource[1] = &non_mem; -// resource[2] = &pre_mem; + resource[2] = &pre_mem; return 1; } diff --git a/arch/arm/nwfpe/fpa11.c b/arch/arm/nwfpe/fpa11.c index 7ae6fd692fd1..f95898dfa595 100644 --- a/arch/arm/nwfpe/fpa11.c +++ b/arch/arm/nwfpe/fpa11.c @@ -26,6 +26,7 @@ #include "fpmodule.inl" #include <linux/compiler.h> +#include <linux/string.h> #include <asm/system.h> /* forward declarations */ |