diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
| commit | ea0daab4ae4a2f853f06c76961c0ed324fd0804c (patch) | |
| tree | f6fbe2db5772695181b7a7257b05e43343bd8d75 /drivers/i2c/busses/i2c-ixp4xx.c | |
| parent | 58aab753de605c14b9878a897e7349c3063afeff (diff) | |
| parent | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'drivers/i2c/busses/i2c-ixp4xx.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-ixp4xx.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c index 8c55eafc3a09..f6f5ca31fdba 100644 --- a/drivers/i2c/busses/i2c-ixp4xx.c +++ b/drivers/i2c/busses/i2c-ixp4xx.c | |||
| @@ -26,11 +26,6 @@ | |||
| 26 | * that is passed as the platform_data to this driver. | 26 | * that is passed as the platform_data to this driver. |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/config.h> | ||
| 30 | #ifdef CONFIG_I2C_DEBUG_BUS | ||
| 31 | #define DEBUG 1 | ||
| 32 | #endif | ||
| 33 | |||
| 34 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 35 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 36 | #include <linux/device.h> | 31 | #include <linux/device.h> |