diff options
author | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-02 13:06:42 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-02 13:06:42 -0400 |
commit | 7b2f649ec2da6640878c15298f5d3f8451dd8125 (patch) | |
tree | b26440ffa8853847fa0625f932673c7ff2554f2c /hdpvr-ir-enable.patch | |
parent | 3daa57b3d93c5d0a795e3446850c83483df37f2e (diff) | |
download | kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.tar.gz kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.tar.xz kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.zip |
Linux 2.6.37-rc1
Diffstat (limited to 'hdpvr-ir-enable.patch')
-rw-r--r-- | hdpvr-ir-enable.patch | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hdpvr-ir-enable.patch b/hdpvr-ir-enable.patch index 787c8f84c..f377d6b4a 100644 --- a/hdpvr-ir-enable.patch +++ b/hdpvr-ir-enable.patch @@ -110,7 +110,7 @@ index 463b81b..60cdc06 100644 msgs[i].len); } -@@ -115,31 +120,59 @@ static struct i2c_algorithm hdpvr_algo = { +@@ -115,30 +120,58 @@ static struct i2c_algorithm hdpvr_algo = { .functionality = hdpvr_functionality, }; @@ -119,7 +119,6 @@ index 463b81b..60cdc06 100644 + .owner = THIS_MODULE, + .id = I2C_HW_B_HDPVR, + .algo = &hdpvr_algo, -+ .class = I2C_CLASS_TV_ANALOG, +}; + +static struct i2c_board_info hdpvr_i2c_board_info = { @@ -160,7 +159,6 @@ index 463b81b..60cdc06 100644 - strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C", - sizeof(i2c_adap->name)); - i2c_adap->algo = &hdpvr_algo; -- i2c_adap->class = I2C_CLASS_TV_ANALOG; - i2c_adap->owner = THIS_MODULE; - i2c_adap->dev.parent = &dev->udev->dev; + memcpy(&dev->i2c_adapter, &hdpvr_i2c_adapter_template, |