diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 16:01:05 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 16:01:05 +0200 |
| commit | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (patch) | |
| tree | 3c688483e71261f564fc43be3157b337ae340dca /fs/hppfs/Makefile | |
| parent | 34b2cd5b688b012975fcfc3b3970fc3508fa82c4 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linus' into x86/pebstip-x86-pebs-2008-05-17-14-01-06
Diffstat (limited to 'fs/hppfs/Makefile')
| -rw-r--r-- | fs/hppfs/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/hppfs/Makefile b/fs/hppfs/Makefile index 6890433f7595..8a1f50344368 100644 --- a/fs/hppfs/Makefile +++ b/fs/hppfs/Makefile @@ -1,9 +1,9 @@ # -# Copyright (C) 2002, 2003 Jeff Dike (jdike@karaya.com) +# Copyright (C) 2002 - 2008 Jeff Dike (jdike@{addtoit,linux.intel}.com) # Licensed under the GPL # -hppfs-objs := hppfs_kern.o +hppfs-objs := hppfs.o obj-y = -obj-$(CONFIG_HPPFS) += hppfs.o +obj-$(CONFIG_HPPFS) += $(hppfs-objs) |