diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:50:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:50:19 -0400 |
commit | df6d3916f3b7b7e2067567a256dd4f0c1ea854a2 (patch) | |
tree | 0fdeab1ab5d566605fc99aeb5ea3f621f11e7608 /drivers/net/mace.c | |
parent | 74add80cbd7fe246c893b93ee75ac59acdd01dd4 (diff) | |
parent | 197686dfe0038fd190326d118b743ff65ad20c0e (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
[POWERPC] Abolish powerpc_flash_init()
[POWERPC] Early serial debug support for PPC44x
[POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
[POWERPC] Add device tree for Ebony
[POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
[POWERPC] MPIC U3/U4 MSI backend
[POWERPC] MPIC MSI allocator
[POWERPC] Enable MSI mappings for MPIC
[POWERPC] Tell Phyp we support MSI
[POWERPC] RTAS MSI implementation
[POWERPC] PowerPC MSI infrastructure
[POWERPC] Rip out the existing powerpc msi stubs
[POWERPC] Remove use of 4level-fixup.h for ppc32
[POWERPC] Add powerpc PCI-E reset API implementation
[POWERPC] Holly bootwrapper
[POWERPC] Holly DTS
[POWERPC] Holly defconfig
[POWERPC] Add support for 750CL Holly board
[POWERPC] Generalize tsi108 PCI setup
[POWERPC] Generalize tsi108 PHY types
...
Fixed conflict in include/asm-powerpc/kdebug.h manually
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/mace.c')
-rw-r--r-- | drivers/net/mace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index b3bd62394958..52b9332810c5 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c | |||
@@ -110,9 +110,9 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i | |||
110 | return -ENODEV; | 110 | return -ENODEV; |
111 | } | 111 | } |
112 | 112 | ||
113 | addr = get_property(mace, "mac-address", NULL); | 113 | addr = of_get_property(mace, "mac-address", NULL); |
114 | if (addr == NULL) { | 114 | if (addr == NULL) { |
115 | addr = get_property(mace, "local-mac-address", NULL); | 115 | addr = of_get_property(mace, "local-mac-address", NULL); |
116 | if (addr == NULL) { | 116 | if (addr == NULL) { |
117 | printk(KERN_ERR "Can't get mac-address for MACE %s\n", | 117 | printk(KERN_ERR "Can't get mac-address for MACE %s\n", |
118 | mace->full_name); | 118 | mace->full_name); |