diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-20 03:34:40 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-20 03:34:40 (GMT) |
| commit | 83bdd240eeb388a611b2bdbed9afdb3192966cec (patch) | |
| tree | c899d47c6e929b314007d17d249d0b4b068fa745 /arch/sparc/kernel/of_device_32.c | |
| parent | 65d76fc4b3161ee1e7034a6f764d1151eb51a555 (diff) | |
| parent | 1f474646fdc36b457606bbcd6a3592e6cbd31ac4 (diff) | |
| download | linux-83bdd240eeb388a611b2bdbed9afdb3192966cec.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix sun4u execute bit check in TSB I-TLB load.
sparc: Fix incorrect comparison in of_bus_ambapp_match()
sparc64: Sync of_create_pci_dev() with drivers/pci/probe.c changes.
sparc64: Tighten checks in kstack_valid().
Diffstat (limited to 'arch/sparc/kernel/of_device_32.c')
| -rw-r--r-- | arch/sparc/kernel/of_device_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c index 4c26eb5..53a58b3 100644 --- a/arch/sparc/kernel/of_device_32.c +++ b/arch/sparc/kernel/of_device_32.c @@ -105,7 +105,7 @@ static unsigned long of_bus_sbus_get_flags(const u32 *addr, unsigned long flags) static int of_bus_ambapp_match(struct device_node *np) { - return !strcmp(np->name, "ambapp"); + return !strcmp(np->type, "ambapp"); } static void of_bus_ambapp_count_cells(struct device_node *child, |