Merge commit 'v2.6.27-rc7' into x86/debug

[~andy/linux] / drivers / s390 / char / Makefile

diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile
index 130de19916f27b305deae4c2866dd29bfbda84c1..7e73e39a174122462cc917f953e8b2406278e4f9 100644 (file)
--- a/drivers/s390/char/Makefile
+++ b/drivers/s390/char/Makefile
@@ -3,7 +3,7 @@
 #
 
 obj-y += ctrlchar.o keyboard.o defkeymap.o sclp.o sclp_rw.o sclp_quiesce.o \
-        sclp_info.o sclp_config.o sclp_chp.o
+        sclp_cmd.o sclp_config.o sclp_cpi_sys.o
 
 obj-$(CONFIG_TN3270) += raw3270.o
 obj-$(CONFIG_TN3270_CONSOLE) += con3270.o