diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-05-03 03:26:52 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 06:31:14 -0400 |
commit | 55b61fec22caa3e7872caea6c4100fc75cb8f49b (patch) | |
tree | 995c2cf733bbd9ee1adc6e77773b0e31e9c21267 /arch/powerpc/platforms/powermac/nvram.c | |
parent | d9333afd6a714760c13f76ba275a32ec7bd979c1 (diff) |
[POWERPC] Rename device_is_compatible to of_device_is_compatible
for consistency with other Open Firmware interfaces (and Sparc).
This is just a straight replacement.
This leaves the compatibility define in place.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/powermac/nvram.c')
-rw-r--r-- | arch/powerpc/platforms/powermac/nvram.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/nvram.c b/arch/powerpc/platforms/powermac/nvram.c index 692945c14919..c6f0f9e738e5 100644 --- a/arch/powerpc/platforms/powermac/nvram.c +++ b/arch/powerpc/platforms/powermac/nvram.c | |||
@@ -553,7 +553,7 @@ static int __init core99_nvram_setup(struct device_node *dp, unsigned long addr) | |||
553 | * identify the chip using flash id commands and base ourselves on | 553 | * identify the chip using flash id commands and base ourselves on |
554 | * a list of known chips IDs | 554 | * a list of known chips IDs |
555 | */ | 555 | */ |
556 | if (device_is_compatible(dp, "amd-0137")) { | 556 | if (of_device_is_compatible(dp, "amd-0137")) { |
557 | core99_erase_bank = amd_erase_bank; | 557 | core99_erase_bank = amd_erase_bank; |
558 | core99_write_bank = amd_write_bank; | 558 | core99_write_bank = amd_write_bank; |
559 | } else { | 559 | } else { |
@@ -588,7 +588,7 @@ int __init pmac_nvram_init(void) | |||
588 | } | 588 | } |
589 | } | 589 | } |
590 | 590 | ||
591 | is_core_99 = device_is_compatible(dp, "nvram,flash"); | 591 | is_core_99 = of_device_is_compatible(dp, "nvram,flash"); |
592 | if (is_core_99) { | 592 | if (is_core_99) { |
593 | err = core99_nvram_setup(dp, r1.start); | 593 | err = core99_nvram_setup(dp, r1.start); |
594 | goto bail; | 594 | goto bail; |