summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-12-11 10:10:56 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-12-11 10:10:56 +0000
commit6b79c740aec344fd9ca8acc150dc347588be168d (patch)
tree0d40017b0430be94b3986a2dace1bdecb521bea3
parent53e159267f2711c6b6253815a1eb2eaae112ffcc (diff)
upgrade to 2.6.28-rc8
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13591 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/091-ds1672_missing_id_table.patch21
-rw-r--r--target/linux/orion/Makefile2
2 files changed, 1 insertions, 22 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/091-ds1672_missing_id_table.patch b/target/linux/generic-2.6/patches-2.6.28/091-ds1672_missing_id_table.patch
deleted file mode 100644
index 78a160c9ac..0000000000
--- a/target/linux/generic-2.6/patches-2.6.28/091-ds1672_missing_id_table.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/rtc/rtc-ds1672.c
-+++ b/drivers/rtc/rtc-ds1672.c
-@@ -209,12 +209,18 @@ static int ds1672_probe(struct i2c_clien
- return err;
- }
-
-+static struct i2c_device_id ds1672_id[] = {
-+ { "ds1672", 0 },
-+ { }
-+};
-+
- static struct i2c_driver ds1672_driver = {
- .driver = {
- .name = "rtc-ds1672",
- },
- .probe = &ds1672_probe,
- .remove = &ds1672_remove,
-+ .id_table = ds1672_id,
- };
-
- static int __init ds1672_init(void)
diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
index a259c54e27..46f6e50d05 100644
--- a/target/linux/orion/Makefile
+++ b/target/linux/orion/Makefile
@@ -11,7 +11,7 @@ BOARD:=orion
BOARDNAME:=Marvell Orion
FEATURES:=squashfs
-LINUX_VERSION:=2.6.28-rc7
+LINUX_VERSION:=2.6.28-rc8
include $(INCLUDE_DIR)/target.mk