Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / i2c-ibm_iic.h

diff --git a/drivers/i2c/busses/i2c-ibm_iic.h b/drivers/i2c/busses/i2c-ibm_iic.h
index d819a955d890ecdf5c5897d9a1c9b58fad13d3c4..2b3219d00e92546a2ac190fbd67feb062e8d1f6a 100644 (file)
--- a/drivers/i2c/busses/i2c-ibm_iic.h
+++ b/drivers/i2c/busses/i2c-ibm_iic.h
@@ -22,7 +22,6 @@
 #ifndef __I2C_IBM_IIC_H_
 #define __I2C_IBM_IIC_H_
 
-#include <linux/config.h>
 #include <linux/i2c.h> 
 
 struct iic_regs {