diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-09 04:19:41 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-09 04:19:41 +0200 |
| commit | 8a3e1c670e503ddd6f6c373b307f38b783ee3a50 (patch) | |
| tree | 03094e8425b750d2693a271ebc89b49312e5476a /drivers/of | |
| parent | [POWERPC] fsl: Update fsl_soc to use cell-index property of I2C nodes (diff) | |
| parent | [POWERPC] ehea: Remove dependency on MEMORY_HOTPLUG (diff) | |
| download | linux-8a3e1c670e503ddd6f6c373b307f38b783ee3a50.tar.xz linux-8a3e1c670e503ddd6f6c373b307f38b783ee3a50.zip | |
Merge branch 'merge'
Conflicts:
arch/powerpc/sysdev/fsl_soc.c
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/of_i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c index 715a44471617..b2ccdcbeb896 100644 --- a/drivers/of/of_i2c.c +++ b/drivers/of/of_i2c.c @@ -21,7 +21,6 @@ struct i2c_driver_device { }; static struct i2c_driver_device i2c_devices[] = { - { "dallas,ds1374", "rtc-ds1374" }, }; static int of_find_i2c_driver(struct device_node *node, |