diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-04-12 01:01:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-12 01:01:45 -0700 |
| commit | ed459323250efe979acbbc6c34b91047b39c078c (patch) | |
| tree | c933ecb63bf6d82816db7bd90a2200a675f3cedd | |
| parent | 4fbd14380484c466338108b59fbc04062c01f1df (diff) | |
[PATCH] make ibmasm driver uart support depend on SERIAL_8250
From: Max Asbock <masbock@us.ibm.com>
This patch makes serial line registration in the ibmasm service processor
driver depend on CONFIG_SERIAL_8250. Previously the driver wouldn't
compile when serial driver support wasn't enabled.
| -rw-r--r-- | drivers/misc/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/misc/ibmasm/Makefile | 8 | ||||
| -rw-r--r-- | drivers/misc/ibmasm/ibmasm.h | 5 |
3 files changed, 13 insertions, 4 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 4f1c7a751f73..9fb3e65244f5 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -16,7 +16,9 @@ config IBM_ASM processor. The driver is meant to be used in conjunction with a user space API. The ibmasm driver also enables the OS to use the UART on the - service processor board as a regular serial port. + service processor board as a regular serial port. To make use of + this feature serial driver support (CONFIG_SERIAL_8250) must be + enabled. If unsure, say N. diff --git a/drivers/misc/ibmasm/Makefile b/drivers/misc/ibmasm/Makefile index a5ed5eb98e83..9e63ade5ffd6 100644 --- a/drivers/misc/ibmasm/Makefile +++ b/drivers/misc/ibmasm/Makefile @@ -1,7 +1,7 @@ obj-$(CONFIG_IBM_ASM) := ibmasm.o -ibmasm-objs := module.o \ +ibmasm-y := module.o \ ibmasmfs.o \ event.o \ command.o \ @@ -9,5 +9,7 @@ ibmasm-objs := module.o \ heartbeat.o \ r_heartbeat.o \ dot_command.o \ - lowlevel.o \ - uart.o + lowlevel.o + +ibmasm-$(CONFIG_SERIAL_8250) += uart.o + diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h index 01727a5ca21d..9b3ff1dcfb78 100644 --- a/drivers/misc/ibmasm/ibmasm.h +++ b/drivers/misc/ibmasm/ibmasm.h @@ -220,5 +220,10 @@ extern void ibmasmfs_unregister(void); extern void ibmasmfs_add_sp(struct service_processor *sp); /* uart */ +#ifdef CONFIG_SERIAL_8250 extern void ibmasm_register_uart(struct service_processor *sp); extern void ibmasm_unregister_uart(struct service_processor *sp); +#else +#define ibmasm_register_uart(sp) do { } while(0) +#define ibmasm_unregister_uart(sp) do { } while(0) +#endif |