diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 19:19:21 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 19:19:21 +0300 |
commit | 2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa (patch) | |
tree | b81ab05dac66fa0cccf44896d2d86be7ba52aa49 /drivers/ieee1394 | |
parent | 23c7b521c250b261dd97a7a06d5a2e74b56233d5 (diff) | |
parent | 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff) | |
download | linux-2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa.tar.xz |
Merge branch 'topic/quirk-cleanup' into topic/hda
Diffstat (limited to 'drivers/ieee1394')
-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; |