diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 00:31:06 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 00:31:06 -0800 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/macintosh/smu.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/macintosh/smu.c')
| -rw-r--r-- | drivers/macintosh/smu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index 96faa799b82a..f96feeb6b9ce 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c @@ -660,7 +660,7 @@ static int smu_platform_probe(struct of_device* dev, return 0; } -static struct of_device_id smu_platform_match[] = +static const struct of_device_id smu_platform_match[] = { { .type = "smu", |