git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
ide
/
pci
/
rz1000.c
diff --git
a/drivers/ide/pci/rz1000.c
b/drivers/ide/pci/rz1000.c
index
3405e6a
..
c185531
100644
(file)
--- a/
drivers/ide/pci/rz1000.c
+++ b/
drivers/ide/pci/rz1000.c
@@
-17,7
+17,6
@@
#undef REALLY_SLOW_IO /* most systems can safely undef this */
#undef REALLY_SLOW_IO /* most systems can safely undef this */
-#include <linux/config.h> /* for CONFIG_BLK_DEV_IDEPCI */
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
@@
-33,7
+32,7
@@
#include <asm/io.h>
#include <asm/io.h>
-static void __init init_hwif_rz1000 (ide_hwif_t *hwif)
+static void __
dev
init init_hwif_rz1000 (ide_hwif_t *hwif)
{
u16 reg;
struct pci_dev *dev = hwif->pci_dev;
{
u16 reg;
struct pci_dev *dev = hwif->pci_dev;
@@
-62,8
+61,7
@@
static ide_pci_device_t rz1000_chipset __devinitdata = {
static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{
static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{
- ide_setup_pci_device(dev, &rz1000_chipset);
- return 0;
+ return ide_setup_pci_device(dev, &rz1000_chipset);
}
static struct pci_device_id rz1000_pci_tbl[] = {
}
static struct pci_device_id rz1000_pci_tbl[] = {
@@
-74,12
+72,12
@@
static struct pci_device_id rz1000_pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, rz1000_pci_tbl);
static struct pci_driver driver = {
MODULE_DEVICE_TABLE(pci, rz1000_pci_tbl);
static struct pci_driver driver = {
- .name = "RZ1000
IDE",
+ .name = "RZ1000
_
IDE",
.id_table = rz1000_pci_tbl,
.probe = rz1000_init_one,
};
.id_table = rz1000_pci_tbl,
.probe = rz1000_init_one,
};
-static int rz1000_ide_init(void)
+static int
__init
rz1000_ide_init(void)
{
return ide_pci_register_driver(&driver);
}
{
return ide_pci_register_driver(&driver);
}