diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-02 07:08:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-02 07:08:46 +0200 |
| commit | 8afe2cb4d4af5b472adeac9132200dc8c9100821 (patch) | |
| tree | b6164ed60137b82e6e820a329999f4f0f515bd84 /arch/ppc | |
| parent | 12657cb99e1ca670da6a7cace3b238a42003e629 (diff) | |
| parent | fff76d57d2670a8f15c875355fb840665ebf8a3e (diff) | |
| download | barebox-8afe2cb4d4af5b472adeac9132200dc8c9100821.tar.gz barebox-8afe2cb4d4af5b472adeac9132200dc8c9100821.tar.xz | |
Merge branch 'for-next-manual/oftree-linux-sync'
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/include/asm/string.h | 2 | ||||
| -rw-r--r-- | arch/ppc/mach-mpc5xxx/cpu.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/ppc/include/asm/string.h b/arch/ppc/include/asm/string.h index d912a6b5fe..33d143f04e 100644 --- a/arch/ppc/include/asm/string.h +++ b/arch/ppc/include/asm/string.h @@ -13,8 +13,6 @@ #define __HAVE_ARCH_MEMCMP #define __HAVE_ARCH_MEMCHR -extern int strcasecmp(const char *, const char *); -extern int strncasecmp(const char *, const char *, int); extern char * strcpy(char *,const char *); extern char * strncpy(char *,const char *, __kernel_size_t); extern __kernel_size_t strlen(const char *); diff --git a/arch/ppc/mach-mpc5xxx/cpu.c b/arch/ppc/mach-mpc5xxx/cpu.c index 99f16ebf1d..0ece4a9ed9 100644 --- a/arch/ppc/mach-mpc5xxx/cpu.c +++ b/arch/ppc/mach-mpc5xxx/cpu.c @@ -83,7 +83,7 @@ static int of_mpc5200_fixup(struct device_node *root) int div = in_8((void*)CFG_MBAR + 0x204) & 0x0020 ? 8 : 4; - node = of_find_node_by_path(root, "/cpus/PowerPC,5200@0"); + node = of_find_node_by_path("/cpus/PowerPC,5200@0"); if (!node) return -EINVAL; @@ -91,7 +91,7 @@ static int of_mpc5200_fixup(struct device_node *root) of_property_write_u32(node, "bus-frequency", get_bus_clock()); of_property_write_u32(node, "clock-frequency", get_cpu_clock()); - node = of_find_node_by_path(root, "/soc5200@f0000000"); + node = of_find_node_by_path("/soc5200@f0000000"); if (!node) return -EINVAL; |