diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /arch/arm/Makefile | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 7b8ff66febe1..1a4649667ec8 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -251,6 +251,7 @@ define archhelp | |||
| 251 | echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)' | 251 | echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)' |
| 252 | echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)' | 252 | echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)' |
| 253 | echo '* xipImage - XIP kernel image, if configured (arch/$(ARCH)/boot/xipImage)' | 253 | echo '* xipImage - XIP kernel image, if configured (arch/$(ARCH)/boot/xipImage)' |
| 254 | echo ' uImage - U-Boot wrapped zImage' | ||
| 254 | echo ' bootpImage - Combined zImage and initial RAM disk' | 255 | echo ' bootpImage - Combined zImage and initial RAM disk' |
| 255 | echo ' (supply initrd image via make variable INITRD=<path>)' | 256 | echo ' (supply initrd image via make variable INITRD=<path>)' |
| 256 | echo ' install - Install uncompressed kernel' | 257 | echo ' install - Install uncompressed kernel' |