diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-10-03 04:14:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:04:08 -0400 |
commit | b86cc29dc42203588264d917e88134bdd500b0d7 (patch) | |
tree | 33156758557595ee32e2a43c8198a20feb9efee2 | |
parent | 4fa902a918518bcdc420bd272d2dd13fcae01581 (diff) |
[PATCH] CONFIG_PM=n slim: drivers/ide/pci/sc1200.c
Remove some code which is unneeded if CONFIG_PM=n.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/ide/pci/sc1200.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index fc2b5496b6d2..ff80937d94dd 100644 --- 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 | |||
323 | } | 323 | } |
324 | } | 324 | } |
325 | 325 | ||
326 | #ifdef CONFIG_PM | ||
326 | static ide_hwif_t *lookup_pci_dev (ide_hwif_t *prev, struct pci_dev *dev) | 327 | static ide_hwif_t *lookup_pci_dev (ide_hwif_t *prev, struct pci_dev *dev) |
327 | { | 328 | { |
328 | int h; | 329 | int h; |
@@ -451,6 +452,7 @@ static int sc1200_resume (struct pci_dev *dev) | |||
451 | } | 452 | } |
452 | return 0; | 453 | return 0; |
453 | } | 454 | } |
455 | #endif | ||
454 | 456 | ||
455 | /* | 457 | /* |
456 | * This gets invoked by the IDE driver once for each channel, | 458 | * This gets invoked by the IDE driver once for each channel, |
@@ -499,8 +501,10 @@ static struct pci_driver driver = { | |||
499 | .name = "SC1200_IDE", | 501 | .name = "SC1200_IDE", |
500 | .id_table = sc1200_pci_tbl, | 502 | .id_table = sc1200_pci_tbl, |
501 | .probe = sc1200_init_one, | 503 | .probe = sc1200_init_one, |
504 | #ifdef CONFIG_PM | ||
502 | .suspend = sc1200_suspend, | 505 | .suspend = sc1200_suspend, |
503 | .resume = sc1200_resume, | 506 | .resume = sc1200_resume, |
507 | #endif | ||
504 | }; | 508 | }; |
505 | 509 | ||
506 | static int sc1200_ide_init(void) | 510 | static int sc1200_ide_init(void) |