diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-12 09:47:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-12 09:47:47 -0700 |
commit | 33d444f182a1757640077c6b7381e54c13142b1d (patch) | |
tree | 106bf7bdd645c2efd645ff3973fcfd64d41cfce8 /arch/sparc64/kernel/of_device.c | |
parent | ae7d5c8622a518601a21f14de5c70de5f1c967bf (diff) | |
parent | 8354c5b72636e5321e9b16dae1da1445506f6af6 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Wire up signalfd/timerfd/eventfd syscalls.
[SPARC64]: Add support for bq4802 TOD chip, as found on ultra45.
[SPARC64]: Correct FIRE_IOMMU_FLUSHINV register offset.
[SPARC64]: envctrl.c needs asm/io.h
[SPARC64]: Update defconfig.
[TTY]: Export proc_clear_tty() to modulea.
[SPARC64]: pci_resource_adjust() cannot be __init.
[SPARC64]: Spelling fixes.
[SPARC]: Spelling fixes.
[SPARC64]: Kill LARGE_ALLOCS and update defconfig.
Diffstat (limited to 'arch/sparc64/kernel/of_device.c')
-rw-r--r-- | arch/sparc64/kernel/of_device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c index 9ac9a307999..7455f5d0551 100644 --- a/arch/sparc64/kernel/of_device.c +++ b/arch/sparc64/kernel/of_device.c @@ -596,7 +596,7 @@ static void __init build_device_resources(struct of_device *op, /* Convert to num-entries. */ num_reg /= na + ns; - /* Prevent overruning the op->resources[] array. */ + /* Prevent overrunning the op->resources[] array. */ if (num_reg > PROMREG_MAX) { printk(KERN_WARNING "%s: Too many regs (%d), " "limiting to %d.\n", @@ -904,7 +904,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp, op->num_irqs = 0; } - /* Prevent overruning the op->irqs[] array. */ + /* Prevent overrunning the op->irqs[] array. */ if (op->num_irqs > PROMINTR_MAX) { printk(KERN_WARNING "%s: Too many irqs (%d), " "limiting to %d.\n", |