diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 17:01:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 17:01:19 -0700 |
commit | 9d20593a722c2dab7a5ab74f5d8c9b604aca52f9 (patch) | |
tree | b5492b3191f29f68018c4d76f41f8bab379db0c5 /include | |
parent | 9b59a0a4eefa132a3899b6e8d362f92559c67844 (diff) | |
parent | 9205124c66a69664c6825501cb062ebd2acd3b3a (diff) | |
download | op-kernel-dev-9d20593a722c2dab7a5ab74f5d8c9b604aca52f9.zip op-kernel-dev-9d20593a722c2dab7a5ab74f5d8c9b604aca52f9.tar.gz |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6:
powerpc/5200: Build fix for mpc52xx watchdog timer code
of: Fix comparison of "compatible" properties
powerpc/52xx: update defconfigs
spi/omap2_mcspi: Use transaction speed if provided
spi/omap2_mcspi: fix NULL pointer dereference
uartlite: Fix build on sparc.
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/of.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index f6d9cbc..a367e19 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -127,7 +127,7 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size) /* Default string compare functions, Allow arch asm/prom.h to override */ #if !defined(of_compat_cmp) -#define of_compat_cmp(s1, s2, l) strncasecmp((s1), (s2), (l)) +#define of_compat_cmp(s1, s2, l) strcasecmp((s1), (s2)) #define of_prop_cmp(s1, s2) strcmp((s1), (s2)) #define of_node_cmp(s1, s2) strcasecmp((s1), (s2)) #endif |