aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Michlmayr <tbm@cyrius.com>2006-11-26 19:22:01 +0000
committerMartin Michlmayr <tbm@cyrius.com>2006-11-26 19:22:01 +0000
commit98e632fceb06140ba6ae42f184bed662c4767946 (patch)
tree6632c7ae98ab021afe062de63a2c108fa2ecf0ce
parent0da96174b029ad993e3435366487ecbab570ea87 (diff)
downloadkernel_replicant_linux-98e632fceb06140ba6ae42f184bed662c4767946.tar.gz
kernel_replicant_linux-98e632fceb06140ba6ae42f184bed662c4767946.tar.bz2
kernel_replicant_linux-98e632fceb06140ba6ae42f184bed662c4767946.zip
auto-detect RTC on the N2100
svn path=/dists/sid/linux-2.6/; revision=7892
-rw-r--r--debian/arch/arm/config.iop32x2
-rw-r--r--debian/patches/bugfix/arm/rtc-rs5c372-n2100.patch13
-rw-r--r--debian/patches/series/7-extra1
3 files changed, 15 insertions, 1 deletions
diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x
index da80b3653e12..66a9e39cf76c 100644
--- a/debian/arch/arm/config.iop32x
+++ b/debian/arch/arm/config.iop32x
@@ -1750,7 +1750,7 @@ CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_DRV_X1205 is not set
# CONFIG_RTC_DRV_DS1672 is not set
# CONFIG_RTC_DRV_PCF8563 is not set
-CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_RS5C372=y
# CONFIG_RTC_DRV_M48T86 is not set
# CONFIG_RTC_DRV_TEST is not set
diff --git a/debian/patches/bugfix/arm/rtc-rs5c372-n2100.patch b/debian/patches/bugfix/arm/rtc-rs5c372-n2100.patch
new file mode 100644
index 000000000000..8849312a4420
--- /dev/null
+++ b/debian/patches/bugfix/arm/rtc-rs5c372-n2100.patch
@@ -0,0 +1,13 @@
+Autodetect the RTC chip.
+
+--- a/drivers/rtc/rtc-rs5c372.c
++++ b/drivers/rtc/rtc-rs5c372.c
+@@ -16,7 +16,7 @@ #include <linux/bcd.h>
+ #define DRV_VERSION "0.3"
+
+ /* Addresses to scan */
+-static unsigned short normal_i2c[] = { /* 0x32,*/ I2C_CLIENT_END };
++static unsigned short normal_i2c[] = { 0x32, I2C_CLIENT_END };
+
+ /* Insmod parameters */
+ I2C_CLIENT_INSMOD;
diff --git a/debian/patches/series/7-extra b/debian/patches/series/7-extra
index d2e29cc11430..29e1f1b395ad 100644
--- a/debian/patches/series/7-extra
+++ b/debian/patches/series/7-extra
@@ -5,3 +5,4 @@
+ features/all/xen/vserver-update.patch *_xen-vserver
+ bugfix/r8169-ignore-parity.patch arm
+ bugfix/arm/r8169-ignore-parity-n2100.patch arm
++ bugfix/arm/rtc-rs5c372-n2100.patch arm