Commit e2d70991 authored by David S. Miller's avatar David S. Miller

Merge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6

into kernel.bkbits.net:/home/davem/sparc-2.6
parents 032e9c06 4bc71c44
...@@ -618,8 +618,6 @@ create_iface(struct device_node *np, struct device *dev) ...@@ -618,8 +618,6 @@ create_iface(struct device_node *np, struct device *dev)
chan->iface = iface; chan->iface = iface;
chan->chan_no = i; chan->chan_no = i;
chan->adapter.id = I2C_ALGO_SMBUS; chan->adapter.id = I2C_ALGO_SMBUS;
if (i==1)
chan->adapter.class = I2C_CLASS_HWMON;
chan->adapter.algo = &keywest_algorithm; chan->adapter.algo = &keywest_algorithm;
chan->adapter.algo_data = NULL; chan->adapter.algo_data = NULL;
chan->adapter.client_register = NULL; chan->adapter.client_register = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment