git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../linux-2.6
[safe/jmp/linux-2.6]
/
drivers
/
macintosh
/
adbhid.c
diff --git
a/drivers/macintosh/adbhid.c
b/drivers/macintosh/adbhid.c
index
f5779a7
..
394334e
100644
(file)
--- a/
drivers/macintosh/adbhid.c
+++ b/
drivers/macintosh/adbhid.c
@@
-1206,8
+1206,8
@@
init_ms_a3(int id)
static int __init adbhid_init(void)
{
#ifndef CONFIG_MAC
- if (
(_machine != _MACH_chrp) && (_machine != _MACH_Pmac)
)
- return 0;
+ if (
!machine_is(chrp) && !machine_is(powermac)
)
+
return 0;
#endif
led_request.complete = 1;