update arch/ia64/sn/kernel/sn2/Makefile

PATCH New Christoph Hellwig 1 participant 1 message Sep 27, 2003

lore

Share & tools

lore

Christoph Hellwig

author

2003-09-27 14:18 UTC #0 lore raw

PATCH 1/1 update arch/ia64/sn/kernel/sn2/Makefile

ptc_deadlock.o sn2_smp.o only make sense for CONFIG_SMP, sn_proc_fs.o prominfo_proc.o are procfs-only

arch/ia64/sn/kernel/sn2/Makefile +3 -2

diff -Nru a/arch/ia64/sn/kernel/sn2/Makefile b/arch/ia64/sn/kernel/sn2/Makefile
@@ -11,5 +11,6 @@
 
 EXTRA_CFLAGS := -DLITTLE_ENDIAN
 
-obj-y += cache.o io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \
-	 prominfo_proc.o timer.o
+obj-y			+= cache.o io.o timer.o
+obj-$(CONFIG_SMP)	+= ptc_deadlock.o sn2_smp.o
+obj-$(CONFIG_PROC_FS)	+= sn_proc_fs.o prominfo_proc.o

arch/ia64/sn/kernel/sn2/sn_proc_fs.c +1 -5

diff -Nru a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
@@ -31,10 +31,8 @@
  * http://oss.sgi.com/projects/GenInfo/NoticeExplan
  */
 #include <linux/config.h>
-#include <asm/uaccess.h>
-
-#ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>
+#include <asm/uaccess.h>
 #include <asm/sn/sn_sal.h>

@@ -191,5 +189,3 @@
 	register_sn_force_interrupt();
 	register_sn_linkstats();
 }
-
-#endif /* CONFIG_PROC_FS */