diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-08 16:30:55 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-08 16:30:55 -0700 |
| commit | d15c22e78674f9a5bc0de0932a43abe1aafae303 (patch) | |
| tree | 3e4198c44bd2d9184e91647346c66aa95e28f843 /drivers/ieee1394/pcilynx.c | |
| parent | 0f4954819fb6f840d46076f0dbd313ef5da48f5d (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
| download | talos-obmc-linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.gz talos-obmc-linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.zip | |
Merge commit 'v2.6.29-rc7' into next
Diffstat (limited to 'drivers/ieee1394/pcilynx.c')
| -rw-r--r-- | drivers/ieee1394/pcilynx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c index dc15cadb06ef..38f712036201 100644 --- a/drivers/ieee1394/pcilynx.c +++ b/drivers/ieee1394/pcilynx.c @@ -1419,7 +1419,6 @@ static int __devinit add_card(struct pci_dev *dev, i2c_ad = kzalloc(sizeof(*i2c_ad), GFP_KERNEL); if (!i2c_ad) FAIL("failed to allocate I2C adapter memory"); - i2c_ad->id = I2C_HW_B_PCILYNX; strlcpy(i2c_ad->name, "PCILynx I2C", sizeof(i2c_ad->name)); i2c_adapter_data = bit_data; i2c_ad->algo_data = &i2c_adapter_data; |
