From: Tejun Heo <tj@home-tj.org>
To: bzolnier@gmail.com, linux-ide@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2.6.11-rc2 08/14] ide_pci: Merges opti621.h into opti621.c
Date: Fri, 4 Feb 2005 16:13:18 +0900 (KST) [thread overview]
Message-ID: <20050204071318.BE4F11326F9@htj.dyndns.org> (raw)
In-Reply-To: <42032014.1020606@home-tj.org>
08_ide_pci_opti621_merge.patch
Merges ide/pci/opti621.h into opti621.c.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Index: linux-idepci-export/drivers/ide/pci/opti621.c
===================================================================
--- linux-idepci-export.orig/drivers/ide/pci/opti621.c 2005-02-04 16:07:36.681395063 +0900
+++ linux-idepci-export/drivers/ide/pci/opti621.c 2005-02-04 16:08:25.782398226 +0900
@@ -104,8 +104,6 @@
#include <asm/io.h>
-#include "opti621.h"
-
#define OPTI621_MAX_PIO 3
/* In fact, I do not have any PIO 4 drive
* (address: 25 ns, data: 70 ns, recovery: 35 ns),
@@ -348,6 +346,24 @@ static void __init init_hwif_opti621 (id
hwif->drives[1].autodma = hwif->autodma;
}
+static ide_pci_device_t opti621_chipsets[] __devinitdata = {
+ { /* 0 */
+ .name = "OPTI621",
+ .init_hwif = init_hwif_opti621,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
+ .bootable = ON_BOARD,
+ },{ /* 1 */
+ .name = "OPTI621X",
+ .init_hwif = init_hwif_opti621,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
+ .bootable = ON_BOARD,
+ }
+};
+
static int __devinit opti621_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{
return ide_setup_pci_device(dev, &opti621_chipsets[id->driver_data]);
Index: linux-idepci-export/drivers/ide/pci/opti621.h
===================================================================
--- linux-idepci-export.orig/drivers/ide/pci/opti621.h 2005-02-04 16:07:36.681395063 +0900
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#ifndef OPTI621_H
-#define OPTI621_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-static void init_hwif_opti621(ide_hwif_t *);
-
-static ide_pci_device_t opti621_chipsets[] __devinitdata = {
- { /* 0 */
- .name = "OPTI621",
- .init_hwif = init_hwif_opti621,
- .channels = 2,
- .autodma = AUTODMA,
- .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
- .bootable = ON_BOARD,
- },{ /* 1 */
- .name = "OPTI621X",
- .init_hwif = init_hwif_opti621,
- .channels = 2,
- .autodma = AUTODMA,
- .enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
- .bootable = ON_BOARD,
- }
-};
-
-#endif /* OPTI621_H */
next prev parent reply other threads:[~2005-02-04 7:38 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-02-04 7:11 [PATCH 2.6.11-rc2] ide_pci: cleanup ide pci drivers and merges .h files into .c files Tejun Heo
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 03/14] ide_pci: Merges cmd64x.h into cmd64x.c Tejun Heo
2005-02-06 0:20 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 01/14] ide_pci: Remove lousy macros from aec62xx Tejun Heo
2005-02-06 0:01 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 02/14] ide_pci: Merges aec62xx.h into aec62xx.c Tejun Heo
2005-02-06 0:12 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` Tejun Heo [this message]
2005-02-06 2:00 ` [PATCH 2.6.11-rc2 08/14] ide_pci: Merges opti621.h into opti621.c Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 05/14] ide_pci: Merges generic.h into generic.c Tejun Heo
2005-02-06 0:58 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 07/14] ide_pci: Merges it8172.h into it8172.c Tejun Heo
2005-02-06 1:55 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 04/14] ide_pci: Merges cy82c693.h into cy82c693.c Tejun Heo
2005-02-06 0:32 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 09/14] ide_pci: Merges pdc202xx_new.h into pdc202xx_new.c Tejun Heo
2005-02-06 2:13 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 06/14] ide_pci: Merges hpt366.h into hpt366.c Tejun Heo
2005-02-06 1:44 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 10/14] ide_pci: Removes SPLIT_BYTE macro from pdc202xx_old Tejun Heo
2005-02-06 2:22 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 14/14] ide_pci: Merges serverworks.h into serverworks.c Tejun Heo
2005-02-05 0:01 ` [PATCH REPOST " Tejun Heo
2005-02-06 13:13 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 12/14] ide_pci: Merges piix.h into piix.c Tejun Heo
2005-02-06 13:02 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 13/14] ide_pci: Removes unused SVWKS_DEBUG_DRIVE_INFO Tejun Heo
2005-02-06 13:05 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 11/14] ide_pci: Merges pdc202xx_old.h into pdc202xx_old.c Tejun Heo
2005-02-06 12:53 ` Bartlomiej Zolnierkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050204071318.BE4F11326F9@htj.dyndns.org \
--to=tj@home-tj.org \
--cc=bzolnier@gmail.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®