diff options
Diffstat (limited to 'media-tv/wis-go7007/files/wis-go7007-2.6.24-no_algo_control.diff')
-rw-r--r-- | media-tv/wis-go7007/files/wis-go7007-2.6.24-no_algo_control.diff | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/media-tv/wis-go7007/files/wis-go7007-2.6.24-no_algo_control.diff b/media-tv/wis-go7007/files/wis-go7007-2.6.24-no_algo_control.diff new file mode 100644 index 000000000000..9de0552dce9f --- /dev/null +++ b/media-tv/wis-go7007/files/wis-go7007-2.6.24-no_algo_control.diff @@ -0,0 +1,54 @@ +diff -urN wis-go7007-linux-0.9.8.orig/kernel/go7007-i2c.c wis-go7007-linux-0.9.8/kernel/go7007-i2c.c +--- wis-go7007-linux-0.9.8.orig/kernel/go7007-i2c.c 2008-02-23 13:58:12.000000000 -0500 ++++ wis-go7007-linux-0.9.8/kernel/go7007-i2c.c 2008-02-23 13:59:44.000000000 -0500 +@@ -278,11 +278,13 @@ + return 0; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + static int go7007_algo_control(struct i2c_adapter *adapter, + unsigned int cmd, unsigned long arg) + { + return 0; + } ++#endif + + static u32 go7007_functionality(struct i2c_adapter *adapter) + { +@@ -296,7 +298,9 @@ + #endif + .smbus_xfer = go7007_smbus_xfer, + .master_xfer = go7007_i2c_master_xfer, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + .algo_control = go7007_algo_control, ++#endif + .functionality = go7007_functionality, + }; + +diff -urN wis-go7007-linux-0.9.8.orig/kernel/go7007-usb.c wis-go7007-linux-0.9.8/kernel/go7007-usb.c +--- wis-go7007-linux-0.9.8.orig/kernel/go7007-usb.c 2008-02-23 13:58:12.000000000 -0500 ++++ wis-go7007-linux-0.9.8/kernel/go7007-usb.c 2008-02-23 13:59:48.000000000 -0500 +@@ -918,11 +918,13 @@ + return ret; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + static int go7007_usb_algo_control(struct i2c_adapter *adapter, + unsigned int cmd, unsigned long arg) + { + return 0; + } ++#endif + + static u32 go7007_usb_functionality(struct i2c_adapter *adapter) + { +@@ -937,7 +939,9 @@ + .id = I2C_ALGO_GO7007, + #endif + .master_xfer = go7007_usb_i2c_master_xfer, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + .algo_control = go7007_usb_algo_control, ++#endif + .functionality = go7007_usb_functionality, + }; + |