From 4e77d53e17bd023901027ff92366a7c5dc19307a Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 22 Nov 2008 17:38:24 +0000
Subject: [PATCH] --- yaml --- r: 119327 b: refs/heads/master c:
 d3a307f32ec3554739033762672e533e2d246dae h: refs/heads/master i:   119325:
 332b618ccfe8232c111ca3166a97246c529c09b3   119323:
 b18c0d7b477e798325deaf5e62e69d13e3928c60   119319:
 833f01f35016b825b585401f63c56eb68d438d0a   119311:
 ce91e7f6080c5395b12a668e079ab0d0ce4ace53   119295:
 94b6e5abecc95c93db87f64c8205b503b5e959ff v: v3

---
 [refs]                              | 2 +-
 trunk/arch/ia64/sn/kernel/io_init.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index df09b87bc20c..6234d87809bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffb78a26169351f6c22cdae481b057d50d5d759b
+refs/heads/master: d3a307f32ec3554739033762672e533e2d246dae
diff --git a/trunk/arch/ia64/sn/kernel/io_init.c b/trunk/arch/ia64/sn/kernel/io_init.c
index c3aa851d1ca6..4e1801bad83a 100644
--- a/trunk/arch/ia64/sn/kernel/io_init.c
+++ b/trunk/arch/ia64/sn/kernel/io_init.c
@@ -292,7 +292,7 @@ EXPORT_SYMBOL(sn_io_slot_fixup);
  * sn_pci_controller_fixup() - This routine sets up a bus's resources
  *			       consistent with the Linux PCI abstraction layer.
  */
-static void
+static void __init
 sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
 {
 	s64 status = 0;