From: Andrew Morton Cc: Pekka J Enberg Signed-off-by: Andrew Morton --- drivers/eisa/eisa-bus.c | 9 +++++++-- drivers/mca/mca-bus.c | 10 +++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff -puN drivers/eisa/eisa-bus.c~pm-suspend-eisa-and-mca-devices-fix drivers/eisa/eisa-bus.c --- devel/drivers/eisa/eisa-bus.c~pm-suspend-eisa-and-mca-devices-fix 2006-02-15 04:47:15.000000000 -0800 +++ devel-akpm/drivers/eisa/eisa-bus.c 2006-02-15 04:47:15.000000000 -0800 @@ -128,7 +128,8 @@ static int eisa_bus_match (struct device return 0; } -static int eisa_bus_suspend(struct device * dev, pm_message_t state) +#ifdef CONFIG_PM +static int eisa_bus_suspend(struct device *dev, pm_message_t state) { int ret = 0; @@ -138,7 +139,7 @@ static int eisa_bus_suspend(struct devic return ret; } -static int eisa_bus_resume(struct device * dev) +static int eisa_bus_resume(struct device *dev) { int ret = 0; @@ -147,6 +148,10 @@ static int eisa_bus_resume(struct device return ret; } +#else +#define eisa_bus_suspend NULL +#define eisa_bus_resume NULL +#endif struct bus_type eisa_bus_type = { .name = "eisa", diff -puN drivers/mca/mca-bus.c~pm-suspend-eisa-and-mca-devices-fix drivers/mca/mca-bus.c --- devel/drivers/mca/mca-bus.c~pm-suspend-eisa-and-mca-devices-fix 2006-02-15 04:47:15.000000000 -0800 +++ devel-akpm/drivers/mca/mca-bus.c 2006-02-15 04:47:15.000000000 -0800 @@ -63,7 +63,8 @@ static int mca_bus_match (struct device return 0; } -static int mca_bus_suspend(struct device * dev, pm_message_t state) +#ifdef CONFIG_PM +static int mca_bus_suspend(struct device *dev, pm_message_t state) { int ret = 0; @@ -73,7 +74,7 @@ static int mca_bus_suspend(struct device return ret; } -static int mca_bus_resume(struct device * dev) +static int mca_bus_resume(struct device *dev) { int ret = 0; @@ -82,7 +83,10 @@ static int mca_bus_resume(struct device return ret; } - +#else +#define mca_bus_suspend NULL +#define mca_bus_resume NULL +#endif struct bus_type mca_bus_type = { .name = "MCA", _