From f0377b61aaaf2d7486673791b363a1fed8402e0f Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 19 Oct 2007 00:30:09 +0200
Subject: [PATCH] --- yaml --- r: 71352 b: refs/heads/master c:
 aaf707f061d5d87c9f671caa2904cd41c1c1a99e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8de8771aa989..77aa3f7e3dea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97f84baa030c9e2d235e26e4a96fe7e294049cb0
+refs/heads/master: aaf707f061d5d87c9f671caa2904cd41c1c1a99e
diff --git a/trunk/drivers/ide/pci/scc_pata.c b/trunk/drivers/ide/pci/scc_pata.c
index 2b1d5bd0009f..8ae8f31c41d3 100644
--- a/trunk/drivers/ide/pci/scc_pata.c
+++ b/trunk/drivers/ide/pci/scc_pata.c
@@ -698,7 +698,6 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
 #define DECLARE_SCC_DEV(name_str)			\
   {							\
       .name		= name_str,			\
-      .init_setup	= init_setup_scc,		\
       .init_iops	= init_iops_scc,		\
       .init_hwif	= init_hwif_scc,		\
       .host_flags	= IDE_HFLAG_SINGLE |		\
@@ -722,7 +721,8 @@ static ide_pci_device_t scc_chipsets[] __devinitdata = {
 static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
 	ide_pci_device_t *d = &scc_chipsets[id->driver_data];
-	return d->init_setup(dev, d);
+
+	return init_setup_scc(dev, d);
 }
 
 /**