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
/
sc1200.c
diff --git
a/drivers/ide/pci/sc1200.c
b/drivers/ide/pci/sc1200.c
index
fc2b549
..
8d762d3
100644
(file)
--- a/
drivers/ide/pci/sc1200.c
+++ b/
drivers/ide/pci/sc1200.c
@@
-323,6
+323,7
@@
static void sc1200_tuneproc (ide_drive_t *drive, byte pio) /* mode=255 means "au
}
}
}
}
+#ifdef CONFIG_PM
static ide_hwif_t *lookup_pci_dev (ide_hwif_t *prev, struct pci_dev *dev)
{
int h;
static ide_hwif_t *lookup_pci_dev (ide_hwif_t *prev, struct pci_dev *dev)
{
int h;
@@
-451,6
+452,7
@@
static int sc1200_resume (struct pci_dev *dev)
}
return 0;
}
}
return 0;
}
+#endif
/*
* This gets invoked by the IDE driver once for each channel,
/*
* This gets invoked by the IDE driver once for each channel,
@@
-499,11
+501,13
@@
static struct pci_driver driver = {
.name = "SC1200_IDE",
.id_table = sc1200_pci_tbl,
.probe = sc1200_init_one,
.name = "SC1200_IDE",
.id_table = sc1200_pci_tbl,
.probe = sc1200_init_one,
+#ifdef CONFIG_PM
.suspend = sc1200_suspend,
.resume = sc1200_resume,
.suspend = sc1200_suspend,
.resume = sc1200_resume,
+#endif
};
};
-static int sc1200_ide_init(void)
+static int
__init
sc1200_ide_init(void)
{
return ide_pci_register_driver(&driver);
}
{
return ide_pci_register_driver(&driver);
}