diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /arch/cris/arch-v32/boot/Makefile | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'arch/cris/arch-v32/boot/Makefile')
| -rw-r--r-- | arch/cris/arch-v32/boot/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/boot/Makefile b/arch/cris/arch-v32/boot/Makefile index 3f91349c5f12..99896ad60b30 100644 --- a/arch/cris/arch-v32/boot/Makefile +++ b/arch/cris/arch-v32/boot/Makefile | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | # arch/cris/arch-v32/boot/Makefile | 2 | # arch/cris/arch-v32/boot/Makefile |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | OBJCOPY = objcopy-cris | ||
| 6 | OBJCOPYFLAGS = -O binary -R .note -R .comment | 5 | OBJCOPYFLAGS = -O binary -R .note -R .comment |
| 7 | 6 | ||
| 8 | subdir- := compressed rescue | 7 | subdir- := compressed rescue |