diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-07 13:15:49 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-07 13:15:49 +1100 |
| commit | 9bc2fe9250b581ae916e37ef64ed431430dc4a32 (patch) | |
| tree | a212b4a88bbedbcaa8957d0ead8ed2beac557e3a /scripts | |
| parent | 608705068d21a3e30c2545e587d71fde07884211 (diff) | |
| parent | 9baf64fd05d3e45f665b914e5c0474df4587d2ab (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
arch/mips/cavium-octeon/executive/cvmx-helper-util.c
arch/mips/include/asm/octeon/cvmx-helper-util.h
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/basic/fixdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index cb1f50cf12e3..7f6425e24ce3 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -409,7 +409,7 @@ static void traps(void) int *p = (int *)test; if (*p != INT_CONF) { - fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", + fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianness? %#x\n", *p); exit(2); } |