diff options
author | 2006-09-25 12:26:59 -0400 | |
---|---|---|
committer | 2006-09-25 12:26:59 -0400 | |
commit | 363e065c02b1273364d5356711a83e7f548fc0c8 (patch) | |
tree | 0df0e65da403ade33ade580c2770c97437b1b1af /usr/Makefile | |
parent | [GFS2/DLM] Fix trailing whitespace (diff) | |
parent | [PATCH] pata_pdc2027x iomem annotations (diff) | |
download | linux-dev-363e065c02b1273364d5356711a83e7f548fc0c8.tar.xz linux-dev-363e065c02b1273364d5356711a83e7f548fc0c8.zip |
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming -mm and FC kernels
due to the "one line per header" format now used for the
kernel headers.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Conflicts:
include/linux/Kbuild
include/linux/kernel.h
Diffstat (limited to 'usr/Makefile')
-rw-r--r-- | usr/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/Makefile b/usr/Makefile index 5b31c0b61c76..e338e7bedb29 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -3,6 +3,8 @@ # klibcdirs:; +PHONY += klibcdirs + # Generate builtin.o based on initramfs_data.o obj-y := initramfs_data.o |