diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-09-08 17:27:13 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 17:27:13 -0400 |
| commit | 344a076110f4ecb16ea6d286b63be696604982ed (patch) | |
| tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 /fs/Makefile | |
| parent | 9b17e7e74e767d8a494a74c3c459aeecd1e08c5f (diff) | |
| parent | 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff) | |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile index cf95eb894fd5..15158309dee4 100644 --- a/fs/Makefile +++ b/fs/Makefile | |||
| @@ -90,6 +90,7 @@ obj-$(CONFIG_AUTOFS_FS) += autofs/ | |||
| 90 | obj-$(CONFIG_AUTOFS4_FS) += autofs4/ | 90 | obj-$(CONFIG_AUTOFS4_FS) += autofs4/ |
| 91 | obj-$(CONFIG_ADFS_FS) += adfs/ | 91 | obj-$(CONFIG_ADFS_FS) += adfs/ |
| 92 | obj-$(CONFIG_UDF_FS) += udf/ | 92 | obj-$(CONFIG_UDF_FS) += udf/ |
| 93 | obj-$(CONFIG_RELAYFS_FS) += relayfs/ | ||
| 93 | obj-$(CONFIG_SUN_OPENPROMFS) += openpromfs/ | 94 | obj-$(CONFIG_SUN_OPENPROMFS) += openpromfs/ |
| 94 | obj-$(CONFIG_JFS_FS) += jfs/ | 95 | obj-$(CONFIG_JFS_FS) += jfs/ |
| 95 | obj-$(CONFIG_XFS_FS) += xfs/ | 96 | obj-$(CONFIG_XFS_FS) += xfs/ |