diff options
author | Paul Mackerras | 2008-12-16 04:38:58 +0100 |
---|---|---|
committer | Paul Mackerras | 2008-12-16 04:38:58 +0100 |
commit | 1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch) | |
tree | 0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /drivers/rtc/rtc-max6900.c | |
parent | powerpc/85xx: Fix compile issues with mpc8572ds.dts (diff) | |
parent | powerpc/cell/axon-msi: Fix MSI after kexec (diff) | |
download | kernel-qcow2-linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.gz kernel-qcow2-linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.xz kernel-qcow2-linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.zip |
Merge branch 'merge' into next
Diffstat (limited to 'drivers/rtc/rtc-max6900.c')
-rw-r--r-- | drivers/rtc/rtc-max6900.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c index 80782798763f..a4f6665ab3c5 100644 --- a/drivers/rtc/rtc-max6900.c +++ b/drivers/rtc/rtc-max6900.c @@ -247,12 +247,18 @@ max6900_probe(struct i2c_client *client, const struct i2c_device_id *id) return 0; } +static struct i2c_device_id max6900_id[] = { + { "max6900", 0 }, + { } +}; + static struct i2c_driver max6900_driver = { .driver = { .name = "rtc-max6900", }, .probe = max6900_probe, .remove = max6900_remove, + .id_table = max6900_id, }; static int __init max6900_init(void) |