From ebec4c120d6c279059f802d624f3d634cc7388cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= <khc@pm.waw.pl>
Date: Tue, 17 Mar 2009 14:39:30 +0100
Subject: [PATCH] --- yaml --- r: 137279 b: refs/heads/master c:
 7f3ccb5a22c945916390a9bd7101d0f553fa0fbd h: refs/heads/master i:   137277:
 166bbfb5190caae0bf5637f23952097ffb7b5080   137275:
 6c86f0a08ceef238f4e96299a9fc8909f5ab9d1c   137271:
 78a66847102cb3194d42f272eb74aa97e975e879   137263:
 dfd4183959a25af96b9622e028e02dbe04330b59   137247:
 d03443f3ef5031b722a10e802eebeca4e1c47a34   137215:
 db91301455c129402251b6435a6e6c198d10c30b v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-ixp4xx/common-pci.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4d641ce4a904..a3a60f4f3f6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de3ce856d67b770f7d546e3f3e6a3972deb319a8
+refs/heads/master: 7f3ccb5a22c945916390a9bd7101d0f553fa0fbd
diff --git a/trunk/arch/arm/mach-ixp4xx/common-pci.c b/trunk/arch/arm/mach-ixp4xx/common-pci.c
index 2d0f09e9819d..70afcfe5b881 100644
--- a/trunk/arch/arm/mach-ixp4xx/common-pci.c
+++ b/trunk/arch/arm/mach-ixp4xx/common-pci.c
@@ -501,7 +501,7 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)
 	return 1;
 }
 
-struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys)
+struct pci_bus * __devinit ixp4xx_scan_bus(int nr, struct pci_sys_data *sys)
 {
 	return pci_scan_bus(sys->busnr, &ixp4xx_ops, sys);
 }