diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:32:01 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:32:01 +0200 |
commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
tree | 547fd497a80818a60ac36831377d5df97868173c /fs/hppfs | |
parent | Merge branch 'linus' into x86/pebs (diff) | |
parent | Linux 2.6.26-rc8 (diff) | |
download | linux-da7878d75b8520c9ae00d27dfbbce546a7bfdfbb.tar.xz linux-da7878d75b8520c9ae00d27dfbbce546a7bfdfbb.zip |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'fs/hppfs')
-rw-r--r-- | fs/hppfs/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/hppfs/Makefile b/fs/hppfs/Makefile index 8a1f50344368..3a982bd975d2 100644 --- a/fs/hppfs/Makefile +++ b/fs/hppfs/Makefile @@ -3,7 +3,4 @@ # Licensed under the GPL # -hppfs-objs := hppfs.o - -obj-y = -obj-$(CONFIG_HPPFS) += $(hppfs-objs) +obj-$(CONFIG_HPPFS) += hppfs.o |