summaryrefslogtreecommitdiff
path: root/drivers/misc/ibmasm
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc/ibmasm')
-rw-r--r--drivers/misc/ibmasm/Makefile8
-rw-r--r--drivers/misc/ibmasm/ibmasm.h5
2 files changed, 10 insertions, 3 deletions
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