aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc64/kernel/pci.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-12 09:47:47 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-12 09:47:47 -0700
commit33d444f182a1757640077c6b7381e54c13142b1d (patch)
tree106bf7bdd645c2efd645ff3973fcfd64d41cfce8 /arch/sparc64/kernel/pci.c
parentae7d5c8622a518601a21f14de5c70de5f1c967bf (diff)
parent8354c5b72636e5321e9b16dae1da1445506f6af6 (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/pci.c')
-rw-r--r--arch/sparc64/kernel/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index cf9a75112d0..d4c077dc5e8 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -495,8 +495,8 @@ static void __devinit apb_calc_first_last(u8 map, u32 *first_p, u32 *last_p)
*last_p = last;
}
-static void __init pci_resource_adjust(struct resource *res,
- struct resource *root)
+static void pci_resource_adjust(struct resource *res,
+ struct resource *root)
{
res->start += root->start;
res->end += root->start;