diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-02-01 23:34:14 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-09 10:33:00 -0500 |
commit | 71a157e8edca55198e808f8561dd49017a54ee34 (patch) | |
tree | a78185ea8204f1e375d88545235ba3d4937ebfaf /arch/powerpc/platforms/cell | |
parent | 89751a7cb70a20f0d604dd7c4be29dd7b0011718 (diff) |
of: add 'of_' prefix to machine_is_compatible()
machine is compatible is an OF-specific call. It should have
the of_ prefix to protect the global namespace.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/powerpc/platforms/cell')
-rw-r--r-- | arch/powerpc/platforms/cell/cbe_powerbutton.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/ras.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/cell/cbe_powerbutton.c b/arch/powerpc/platforms/cell/cbe_powerbutton.c index dcddaa5fcb66..f75a4daa4ca2 100644 --- a/arch/powerpc/platforms/cell/cbe_powerbutton.c +++ b/arch/powerpc/platforms/cell/cbe_powerbutton.c | |||
@@ -48,7 +48,7 @@ static int __init cbe_powerbutton_init(void) | |||
48 | int ret = 0; | 48 | int ret = 0; |
49 | struct input_dev *dev; | 49 | struct input_dev *dev; |
50 | 50 | ||
51 | if (!machine_is_compatible("IBM,CBPLUS-1.0")) { | 51 | if (!of_machine_is_compatible("IBM,CBPLUS-1.0")) { |
52 | printk(KERN_ERR "%s: Not a cell blade.\n", __func__); | 52 | printk(KERN_ERR "%s: Not a cell blade.\n", __func__); |
53 | ret = -ENODEV; | 53 | ret = -ENODEV; |
54 | goto out; | 54 | goto out; |
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c index 5e0a191764fc..608fd2b584c9 100644 --- a/arch/powerpc/platforms/cell/ras.c +++ b/arch/powerpc/platforms/cell/ras.c | |||
@@ -255,7 +255,7 @@ static int __init cbe_sysreset_init(void) | |||
255 | { | 255 | { |
256 | struct cbe_pmd_regs __iomem *regs; | 256 | struct cbe_pmd_regs __iomem *regs; |
257 | 257 | ||
258 | sysreset_hack = machine_is_compatible("IBM,CBPLUS-1.0"); | 258 | sysreset_hack = of_machine_is_compatible("IBM,CBPLUS-1.0"); |
259 | if (!sysreset_hack) | 259 | if (!sysreset_hack) |
260 | return 0; | 260 | return 0; |
261 | 261 | ||