diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-02-02 04:34:14 (GMT) |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-09 15:33:00 (GMT) |
| commit | 71a157e8edca55198e808f8561dd49017a54ee34 (patch) | |
| tree | a78185ea8204f1e375d88545235ba3d4937ebfaf /drivers/serial | |
| parent | 89751a7cb70a20f0d604dd7c4be29dd7b0011718 (diff) | |
| download | linux-71a157e8edca55198e808f8561dd49017a54ee34.tar.xz | |
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 'drivers/serial')
| -rw-r--r-- | drivers/serial/pmac_zilog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index 683e66f..3e2ae48 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c @@ -2031,9 +2031,9 @@ static int __init pmz_console_setup(struct console *co, char *options) /* * XServe's default to 57600 bps */ - if (machine_is_compatible("RackMac1,1") - || machine_is_compatible("RackMac1,2") - || machine_is_compatible("MacRISC4")) + if (of_machine_is_compatible("RackMac1,1") + || of_machine_is_compatible("RackMac1,2") + || of_machine_is_compatible("MacRISC4")) baud = 57600; /* |