kernel: update 3.10 to 3.10.2

[openwrt.git] / target / linux / brcm2708 / patches-3.10 / 015-bcm2708-i2c-driver.patch

diff --git a/target/linux/brcm2708/patches-3.10/015-bcm2708-i2c-driver.patch b/target/linux/brcm2708/patches-3.10/015-bcm2708-i2c-driver.patch
index 531ae69..82388b7 100644 (file)
--- a/target/linux/brcm2708/patches-3.10/015-bcm2708-i2c-driver.patch
+++ b/target/linux/brcm2708/patches-3.10/015-bcm2708-i2c-driver.patch
@@ -1,6 +1,5 @@
-diff -urN linux-3.10/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.10.y/drivers/i2c/busses/i2c-bcm2708.c
---- linux-3.10/drivers/i2c/busses/i2c-bcm2708.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-rpi-3.10.y/drivers/i2c/busses/i2c-bcm2708.c  2013-07-06 15:25:50.000000000 +0100
+--- /dev/null
++++ b/drivers/i2c/busses/i2c-bcm2708.c
 @@ -0,0 +1,408 @@
 +/*
 + * Driver for Broadcom BCM2708 BSC Controllers
@@ -410,10 +409,9 @@ diff -urN linux-3.10/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.10.y/drivers/i
 +MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:" DRV_NAME);
-diff -urN linux-3.10/drivers/i2c/busses/Kconfig linux-rpi-3.10.y/drivers/i2c/busses/Kconfig
---- linux-3.10/drivers/i2c/busses/Kconfig      2013-06-30 23:13:29.000000000 +0100
-+++ linux-rpi-3.10.y/drivers/i2c/busses/Kconfig        2013-07-06 15:25:50.000000000 +0100
-@@ -343,6 +343,25 @@
+--- a/drivers/i2c/busses/Kconfig
++++ b/drivers/i2c/busses/Kconfig
+@@ -343,6 +343,25 @@ config I2C_BCM2835
          This support is also available as a module.  If so, the module
          will be called i2c-bcm2835.
  
@@ -439,10 +437,9 @@ diff -urN linux-3.10/drivers/i2c/busses/Kconfig linux-rpi-3.10.y/drivers/i2c/bus
  config I2C_BLACKFIN_TWI
        tristate "Blackfin TWI I2C support"
        depends on BLACKFIN
-diff -urN linux-3.10/drivers/i2c/busses/Makefile linux-rpi-3.10.y/drivers/i2c/busses/Makefile
---- linux-3.10/drivers/i2c/busses/Makefile     2013-06-30 23:13:29.000000000 +0100
-+++ linux-rpi-3.10.y/drivers/i2c/busses/Makefile       2013-07-06 15:25:50.000000000 +0100
-@@ -32,6 +32,7 @@
+--- a/drivers/i2c/busses/Makefile
++++ b/drivers/i2c/busses/Makefile
+@@ -32,6 +32,7 @@ obj-$(CONFIG_I2C_POWERMAC)   += i2c-powerm
  obj-$(CONFIG_I2C_AT91)                += i2c-at91.o
  obj-$(CONFIG_I2C_AU1550)      += i2c-au1550.o
  obj-$(CONFIG_I2C_BCM2835)     += i2c-bcm2835.o