diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
| commit | 28eb177dfa5982d132edceed891cb3885df258bb (patch) | |
| tree | 5f8fdc37ad1d8d0793e9c47da7d908b97c814ffb /drivers/macintosh/via-pmu-led.c | |
| parent | fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (diff) | |
| parent | db392219c5f572610645696e3672f6ea38783a65 (diff) | |
Merge branch 'master' into upstream
Conflicts:
net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c
Diffstat (limited to 'drivers/macintosh/via-pmu-led.c')
| -rw-r--r-- | drivers/macintosh/via-pmu-led.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c index 5189d5454b1f..179af10105d9 100644 --- a/drivers/macintosh/via-pmu-led.c +++ b/drivers/macintosh/via-pmu-led.c | |||
| @@ -120,7 +120,7 @@ static int __init via_pmu_led_init(void) | |||
| 120 | dt = of_find_node_by_path("/"); | 120 | dt = of_find_node_by_path("/"); |
| 121 | if (dt == NULL) | 121 | if (dt == NULL) |
| 122 | return -ENODEV; | 122 | return -ENODEV; |
| 123 | model = (const char *)get_property(dt, "model", NULL); | 123 | model = get_property(dt, "model", NULL); |
| 124 | if (model == NULL) | 124 | if (model == NULL) |
| 125 | return -ENODEV; | 125 | return -ENODEV; |
| 126 | if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 && | 126 | if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 && |