From 72283111a1ac8cc8a7ce6778fc347323c94d6e83 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 22 Nov 2008 17:34:34 +0000
Subject: [PATCH] --- yaml --- r: 119305 b: refs/heads/master c:
 d16d7667f9c211e8d9b7e2365cc3d3a83fc6a8e2 h: refs/heads/master i:   119303:
 621f7a75e31fb78c0bbbff2802b2f2a2ad5bcbec v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/ide/icside.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3c85eec4bf1b..4d36c233aaf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 596f1034190565529e507e1eb8df6def1c9f5560
+refs/heads/master: d16d7667f9c211e8d9b7e2365cc3d3a83fc6a8e2
diff --git a/trunk/drivers/ide/icside.c b/trunk/drivers/ide/icside.c
index 2d848010499d..81f70caeb40f 100644
--- a/trunk/drivers/ide/icside.c
+++ b/trunk/drivers/ide/icside.c
@@ -419,7 +419,7 @@ static void icside_setup_ports(hw_regs_t *hw, void __iomem *base,
 	hw->chipset = ide_acorn;
 }
 
-static int __init
+static int __devinit
 icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 {
 	void __iomem *base;
@@ -473,7 +473,7 @@ static const struct ide_port_info icside_v6_port_info __initdata = {
 	.swdma_mask		= ATA_SWDMA2,
 };
 
-static int __init
+static int __devinit
 icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 {
 	void __iomem *ioc_base, *easi_base;