aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-05-04 11:35:08 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-05-04 11:35:08 +0000
commit64fbade9399c6413439be939f0c92ebb2724ee87 (patch)
treea175d1e8ee566b98852ee7f43b310fbd018aaf0f /target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch
parent7cf4e9f00a6f07393344d0b56ed02c61f5867c9f (diff)
downloadupstream-64fbade9399c6413439be939f0c92ebb2724ee87.tar.gz
upstream-64fbade9399c6413439be939f0c92ebb2724ee87.tar.bz2
upstream-64fbade9399c6413439be939f0c92ebb2724ee87.zip
refresh patches
SVN-Revision: 15581
Diffstat (limited to 'target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch')
-rw-r--r--target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch16
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch b/target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch
index 7eed8b2a71..dc63165c5e 100644
--- a/target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch
+++ b/target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.20/arch/cris/arch-v10/drivers/Kconfig
-===================================================================
---- linux-2.6.25.20.orig/arch/cris/arch-v10/drivers/Kconfig 2009-02-09 09:30:40.000000000 +0100
-+++ linux-2.6.25.20/arch/cris/arch-v10/drivers/Kconfig 2009-02-09 21:23:12.000000000 +0100
-@@ -450,11 +450,18 @@
+--- a/arch/cris/arch-v10/drivers/Kconfig
++++ b/arch/cris/arch-v10/drivers/Kconfig
+@@ -450,11 +450,18 @@ config ETRAX_I2C
i2c_arg = I2C_READARG(STA013_READ_ADDR, reg);
val = ioctl(fd, _IO(ETRAXI2C_IOCTYPE, I2C_READREG), i2c_arg);
@@ -22,7 +20,7 @@ Index: linux-2.6.25.20/arch/cris/arch-v10/drivers/Kconfig
help
Select whether to use the special I2C mode in the PB I/O register or
not. This option needs to be selected in order to use some drivers
-@@ -478,7 +485,7 @@
+@@ -478,7 +485,7 @@ config ETRAX_I2C_CLK_PORT
config ETRAX_I2C_EEPROM
bool "I2C EEPROM (non-volatile RAM) support"
@@ -31,10 +29,8 @@ Index: linux-2.6.25.20/arch/cris/arch-v10/drivers/Kconfig
help
Enables I2C EEPROM (non-volatile RAM) on PB0 and PB1 using the I2C
driver. Select size option: Probed, 2k, 8k, 16k.
-Index: linux-2.6.25.20/arch/cris/arch-v10/drivers/Makefile
-===================================================================
---- linux-2.6.25.20.orig/arch/cris/arch-v10/drivers/Makefile 2009-02-09 09:30:41.000000000 +0100
-+++ linux-2.6.25.20/arch/cris/arch-v10/drivers/Makefile 2009-02-09 09:35:39.000000000 +0100
+--- a/arch/cris/arch-v10/drivers/Makefile
++++ b/arch/cris/arch-v10/drivers/Makefile
@@ -4,6 +4,7 @@
obj-$(CONFIG_ETRAX_AXISFLASHMAP) += axisflashmap.o