diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-11 11:13:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-11 11:13:46 -0800 |
| commit | 0969d11e201b82d30a158ccdb3aca67a7b845613 (patch) | |
| tree | 25273891ff5ac341d5c65ee0f82fc0a55aa8cfb6 /arch/microblaze/kernel/prom.c | |
| parent | 16ee8db6a93ffbc021132599f33288613f042c3d (diff) | |
| parent | d15be32c30e6108cdab76ca895a19b5f8b88b5ca (diff) | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: remove obsolete DEBUG_BOOTMEM
microblaze: trivial: Fix removed the part of line
microblaze: Fix __muldi3 function for little-endian.
microblaze: Clear i/dcache for sw breakpoints
microblaze: Remove useless early_init_dt_check_for_initrd
microblaze: Fix unaligned exception for little endian platform
microblaze: Add PVR for Microblaze v8.00.b
microblaze: Correct PVR access macros
Revert "microblaze: Simplify syscall rutine"
microblaze: Fix initramfs
arch/microblaze: Remove unnecessary semicolons
Diffstat (limited to 'arch/microblaze/kernel/prom.c')
| -rw-r--r-- | arch/microblaze/kernel/prom.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index a105301e2b7..c881393f07f 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c @@ -61,14 +61,12 @@ static int __init early_init_dt_scan_serial(unsigned long node, char *p; int *addr; - pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname); + pr_debug("search \"serial\", depth: %d, uname: %s\n", depth, uname); /* find all serial nodes */ if (strncmp(uname, "serial", 6) != 0) return 0; - early_init_dt_check_for_initrd(node); - /* find compatible node with uartlite */ p = of_get_flat_dt_prop(node, "compatible", &l); if ((strncmp(p, "xlnx,xps-uartlite", 17) != 0) && |