summaryrefslogtreecommitdiffstats
path: root/fs/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
commitdcec8a13bf565e47942a1751a9cec21bec5648fe (patch)
tree548b69625b18cc2e88c3e68d0923be546c9ebb03 /fs/Makefile
parent2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff)
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash. o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'fs/Makefile')
-rw-r--r--fs/Makefile11
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/Makefile b/fs/Makefile
index bc97a3f33..c5973dd39 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -17,7 +17,8 @@ O_OBJS = open.o read_write.o devices.o file_table.o buffer.o \
MOD_LIST_NAME := FS_MODULES
ALL_SUB_DIRS = coda minix ext2 fat msdos vfat proc isofs nfs umsdos ntfs \
- hpfs sysv smbfs ncpfs ufs affs romfs autofs hfs lockd nfsd nls
+ hpfs sysv smbfs ncpfs ufs affs romfs autofs hfs lockd nfsd \
+ nls devpts
ifeq ($(CONFIG_QUOTA),y)
O_OBJS += dquot.o
@@ -234,6 +235,14 @@ else
endif
endif
+ifeq ($(CONFIG_DEVPTS_FS),y)
+SUB_DIRS += devpts
+else
+ ifeq ($(CONFIG_DEVPTS_FS),m)
+ MOD_SUB_DIRS += devpts
+ endif
+endif
+
ifeq ($(CONFIG_BINFMT_ELF),y)
BINFMTS += binfmt_elf.o
else