Commit ed459323 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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.
parent 4fbd1438
...@@ -16,7 +16,9 @@ config IBM_ASM ...@@ -16,7 +16,9 @@ config IBM_ASM
processor. The driver is meant to be used in conjunction with processor. The driver is meant to be used in conjunction with
a user space API. a user space API.
The ibmasm driver also enables the OS to use the UART on the 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. If unsure, say N.
......
obj-$(CONFIG_IBM_ASM) := ibmasm.o obj-$(CONFIG_IBM_ASM) := ibmasm.o
ibmasm-objs := module.o \ ibmasm-y := module.o \
ibmasmfs.o \ ibmasmfs.o \
event.o \ event.o \
command.o \ command.o \
...@@ -9,5 +9,7 @@ ibmasm-objs := module.o \ ...@@ -9,5 +9,7 @@ ibmasm-objs := module.o \
heartbeat.o \ heartbeat.o \
r_heartbeat.o \ r_heartbeat.o \
dot_command.o \ dot_command.o \
lowlevel.o \ lowlevel.o
uart.o
ibmasm-$(CONFIG_SERIAL_8250) += uart.o
...@@ -220,5 +220,10 @@ extern void ibmasmfs_unregister(void); ...@@ -220,5 +220,10 @@ extern void ibmasmfs_unregister(void);
extern void ibmasmfs_add_sp(struct service_processor *sp); extern void ibmasmfs_add_sp(struct service_processor *sp);
/* uart */ /* uart */
#ifdef CONFIG_SERIAL_8250
extern void ibmasm_register_uart(struct service_processor *sp); extern void ibmasm_register_uart(struct service_processor *sp);
extern void ibmasm_unregister_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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment