summaryrefslogtreecommitdiffstats
path: root/arch/arm26/boot/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-30 00:18:49 +0200
committerJeff Garzik <jeff@garzik.org>2006-03-30 00:18:49 +0200
commite02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606 (patch)
tree2f3db60be4c57eca2a4c3ab3f3122dcf1ec0c624 /arch/arm26/boot/Makefile
parent[PATCH] libata: add FIXME above ata_dev_xfermask() (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606.tar.xz
linux-e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606.zip
Merge branch 'master'
Diffstat (limited to 'arch/arm26/boot/Makefile')
-rw-r--r--arch/arm26/boot/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm26/boot/Makefile b/arch/arm26/boot/Makefile
index b5c2277654d4..68acb7b0d47f 100644
--- a/arch/arm26/boot/Makefile
+++ b/arch/arm26/boot/Makefile
@@ -1,6 +1,9 @@
#
# arch/arm26/boot/Makefile
#
+# This file is included by the global makefile so that you can add your own
+# architecture-specific flags and dependencies.
+#
# This file is subject to the terms and conditions of the GNU General Public
# License. See the file "COPYING" in the main directory of this archive
# for more details.
@@ -60,7 +63,7 @@ $(obj)/xipImage: vmlinux FORCE
@echo ' Kernel: $@ is ready'
endif
-.PHONY: initrd
+PHONY += initrd
initrd:
@test "$(INITRD_PHYS)" != "" || \
(echo This machine does not support INITRD; exit -1)