summaryrefslogtreecommitdiff
blob: d6e0f65dc64caf231eaf64312271ce9f407d10f4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
diff -ruN em8300-0.15.1/modules/adv717x.c em8300-0.15.1-modified/modules/adv717x.c
--- em8300-0.15.1/modules/adv717x.c	2005-04-09 21:23:54.000000000 +0100
+++ em8300-0.15.1-modified/modules/adv717x.c	2005-11-21 22:53:56.000000000 +0000
@@ -41,6 +41,7 @@
 #include <asm/uaccess.h>
 
 #include <linux/i2c.h>
+#include <linux/i2c-isa.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/video_encoder.h>
 
@@ -85,11 +86,6 @@
 MODULE_PARM(color_bars, "1-" __MODULE_STRING(EM8300_MAX) "i");
 MODULE_PARM_DESC(color_bars, "If you set this to 1 a set of color bars will be displayed on your screen (used for testing if the chip is working). Defaults to 0.");
 
-#define i2c_is_isa_client(clientptr) \
-		((clientptr)->adapter->algo->id == I2C_ALGO_ISA)
-#define i2c_is_isa_adapter(adapptr) \
-		((adapptr)->algo->id == I2C_ALGO_ISA)
-
 
 #define ADV7175_REG_MR0 0
 #define ADV7175_REG_MR1 1
diff -ruN em8300-0.15.1/modules/bt865.c em8300-0.15.1-modified/modules/bt865.c
--- em8300-0.15.1/modules/bt865.c	2005-04-09 21:23:54.000000000 +0100
+++ em8300-0.15.1-modified/modules/bt865.c	2005-11-21 22:54:19.000000000 +0000
@@ -45,6 +45,7 @@
 #include <asm/uaccess.h>
 
 #include <linux/i2c.h>
+#include <linux/i2c-isa.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/video_encoder.h>
 
@@ -65,11 +66,6 @@
 MODULE_PARM(rgb_mode, "1-" __MODULE_STRING(EM8300_MAX) "i");
 MODULE_PARM_DESC(rgb_mode, "If you set this to 1, RGB output is enabled. You will need to hack the DXR3 hardware. Defaults to 0.");
 
-#define i2c_is_isa_client(clientptr) \
-		((clientptr)->adapter->algo->id == I2C_ALGO_ISA)
-#define i2c_is_isa_adapter(adapptr) \
-		((adapptr)->algo->id == I2C_ALGO_ISA)
-
 
 static int bt865_attach_adapter(struct i2c_adapter *adapter);
 int bt865_detach_client(struct i2c_client *client);