From 7ba7acba1bdeb4c94b7ac029bc3eb65fe3d94cf0 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 20 May 2006 15:00:32 -0700
Subject: [PATCH] --- yaml --- r: 26879 b: refs/heads/master c:
 9781b8b055bd0a02a043ed80fb8d59d703a49daf h: refs/heads/master i:   26877:
 c9f5c524dac2efa094a0db9b397d6c42b1fde904   26875:
 f5d37cc1f38f3b7d65bcc6c7e2768d94e4c2354d   26871:
 32911b7ad6a996c5852b39a6ab18d133877f1dc9   26863:
 8f56bbd5fb5edc90bca81cb8552f92bed024d03b   26847:
 84aa4549a2dcec2d0ee462c673b874547092acb5   26815:
 e361731a775c4d9ee1ed8a75b977aa72ff234b0d   26751:
 7682f21b339032f1789fc9ea96e8863b7dae7f67   26623:
 944cb629fbf5931edec5b916c13733c72d9bda63 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pcmcia/pd6729.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 513156c2c77d..d8bedf26ccbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e984bb43f7450312ba66fe0e67a99efa6be3b246
+refs/heads/master: 9781b8b055bd0a02a043ed80fb8d59d703a49daf
diff --git a/trunk/drivers/pcmcia/pd6729.c b/trunk/drivers/pcmcia/pd6729.c
index 16d1ea7b0a18..247ab837f841 100644
--- a/trunk/drivers/pcmcia/pd6729.c
+++ b/trunk/drivers/pcmcia/pd6729.c
@@ -589,7 +589,7 @@ static int pd6729_check_irq(int irq, int flags)
 	return 0;
 }
 
-static u_int __init pd6729_isa_scan(void)
+static u_int __devinit pd6729_isa_scan(void)
 {
 	u_int mask0, mask = 0;
 	int i;