aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/841-rtc_pt7c4338.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
commitdcde44e37ed89b02bf98c89c9d20eb7097e21707 (patch)
treeb152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/841-rtc_pt7c4338.patch
parent59d0f03c9af97f38ddb4b99d9a86fa845e1fe170 (diff)
downloadmaster-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.gz
master-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.bz2
master-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.zip
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/841-rtc_pt7c4338.patch')
-rw-r--r--target/linux/generic/patches-3.6/841-rtc_pt7c4338.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.6/841-rtc_pt7c4338.patch b/target/linux/generic/patches-3.6/841-rtc_pt7c4338.patch
index 2c9e6035aa..17b3d755d2 100644
--- a/target/linux/generic/patches-3.6/841-rtc_pt7c4338.patch
+++ b/target/linux/generic/patches-3.6/841-rtc_pt7c4338.patch
@@ -1,6 +1,6 @@
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
-@@ -379,6 +379,15 @@ config RTC_DRV_RV3029C2
+@@ -389,6 +389,15 @@ config RTC_DRV_RV3029C2
This driver can also be built as a module. If so, the module
will be called rtc-rv3029c2.
@@ -18,7 +18,7 @@
comment "SPI RTC drivers"
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
-@@ -79,6 +79,7 @@ obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030
+@@ -82,6 +82,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