projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4fa902a
)
[PATCH] CONFIG_PM=n slim: drivers/ide/pci/sc1200.c
author
Alexey Dobriyan
<
[email protected]
>
Tue, 3 Oct 2006 08:14:32 +0000
(
01:14
-0700)
committer
Linus Torvalds
<
[email protected]
>
Tue, 3 Oct 2006 15:04:08 +0000
(08:04 -0700)
Remove some code which is unneeded if CONFIG_PM=n.
Signed-off-by: Alexey Dobriyan <
[email protected]
>
Cc: Alan Cox <
[email protected]
>
Cc: Bartlomiej Zolnierkiewicz <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/ide/pci/sc1200.c
patch
|
blob
|
history
diff --git
a/drivers/ide/pci/sc1200.c
b/drivers/ide/pci/sc1200.c
index fc2b5496b6d251a611bd3200baf733d8263e1f23..ff80937d94ddd307c6c2974f058980ee71273285 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;
@@
-451,6
+452,7
@@
static int sc1200_resume (struct pci_dev *dev)
}
return 0;
}
+#endif
/*
* This gets invoked by the IDE driver once for each channel,
@@
-499,8
+501,10
@@
static struct pci_driver driver = {
.name = "SC1200_IDE",
.id_table = sc1200_pci_tbl,
.probe = sc1200_init_one,
+#ifdef CONFIG_PM
.suspend = sc1200_suspend,
.resume = sc1200_resume,
+#endif
};
static int sc1200_ide_init(void)