aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-04-29 16:56:03 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-04-29 16:56:03 +0000
commit532b74ff7bd96bfaf6424d3ebe3aed31fd13a4db (patch)
tree189d46d513b0909f1f2bbf2f382bd566f83c13dd /target
parent27a1f6652ac1ad39722b5c0fdf84b3419fe227c9 (diff)
downloadupstream-532b74ff7bd96bfaf6424d3ebe3aed31fd13a4db.tar.gz
upstream-532b74ff7bd96bfaf6424d3ebe3aed31fd13a4db.tar.bz2
upstream-532b74ff7bd96bfaf6424d3ebe3aed31fd13a4db.zip
linux/3.3: refresh patches
SVN-Revision: 31531
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch22
1 files changed, 8 insertions, 14 deletions
diff --git a/target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch b/target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch
index ac41528613..2c9e6035aa 100644
--- a/target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch
+++ b/target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch
@@ -1,8 +1,6 @@
-Index: linux-3.3/drivers/rtc/Kconfig
-===================================================================
---- linux-3.3.orig/drivers/rtc/Kconfig 2012-03-20 07:52:18.838582040 +0100
-+++ linux-3.3/drivers/rtc/Kconfig 2012-03-20 07:52:19.228579409 +0100
-@@ -379,6 +379,15 @@
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -379,6 +379,15 @@ config RTC_DRV_RV3029C2
This driver can also be built as a module. If so, the module
will be called rtc-rv3029c2.
@@ -18,11 +16,9 @@ Index: linux-3.3/drivers/rtc/Kconfig
endif # I2C
comment "SPI RTC drivers"
-Index: linux-3.3/drivers/rtc/Makefile
-===================================================================
---- linux-3.3.orig/drivers/rtc/Makefile 2012-03-20 07:52:18.838582040 +0100
-+++ linux-3.3/drivers/rtc/Makefile 2012-03-20 07:52:19.228579409 +0100
-@@ -79,6 +79,7 @@
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -79,6 +79,7 @@ obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030
obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o
obj-$(CONFIG_RTC_DRV_PM8XXX) += rtc-pm8xxx.o
obj-$(CONFIG_RTC_DRV_PS3) += rtc-ps3.o
@@ -30,10 +26,8 @@ Index: linux-3.3/drivers/rtc/Makefile
obj-$(CONFIG_RTC_DRV_PUV3) += rtc-puv3.o
obj-$(CONFIG_RTC_DRV_PXA) += rtc-pxa.o
obj-$(CONFIG_RTC_DRV_R9701) += rtc-r9701.o
-Index: linux-3.3/drivers/rtc/rtc-pt7c4338.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.3/drivers/rtc/rtc-pt7c4338.c 2012-03-20 07:52:19.228579409 +0100
+--- /dev/null
++++ b/drivers/rtc/rtc-pt7c4338.c
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2010 Freescale Semiconductor, Inc.