aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/boot/ecoff.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2013-12-16 02:04:49 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-12-16 02:04:49 -0800
commit348324c5b10bcba8d9daabdfb85a6927311be34f (patch)
treed06ca3a264407a14a1f36c1b798d6dc0dc1582d8 /arch/mips/boot/ecoff.h
parent1e63bd9cc43db5400a1423a7ec8266b4e7c54bd0 (diff)
parent319e2e3f63c348a9b66db4667efa73178e18b17d (diff)
downloadkernel_replicant_linux-348324c5b10bcba8d9daabdfb85a6927311be34f.tar.gz
kernel_replicant_linux-348324c5b10bcba8d9daabdfb85a6927311be34f.tar.bz2
kernel_replicant_linux-348324c5b10bcba8d9daabdfb85a6927311be34f.zip
Merge tag 'v3.13-rc4' into next
Synchronize with mainline to bring in the new keycode definitions and new hwmon API.
Diffstat (limited to 'arch/mips/boot/ecoff.h')
-rw-r--r--arch/mips/boot/ecoff.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/boot/ecoff.h b/arch/mips/boot/ecoff.h
index 83e5c3813d67..7a75ce2c1bcd 100644
--- a/arch/mips/boot/ecoff.h
+++ b/arch/mips/boot/ecoff.h
@@ -12,7 +12,6 @@ typedef struct filehdr {
} FILHDR;
#define FILHSZ sizeof(FILHDR)
-#define OMAGIC 0407
#define MIPSEBMAGIC 0x160
#define MIPSELMAGIC 0x162