diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-12-11 10:10:56 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-12-11 10:10:56 +0000 |
| commit | eccc01ab6c604c3b42948982e352771c04446d30 (patch) | |
| tree | d1ef16cb281483c11c0ef1ca0addc5cc149d05d5 | |
| parent | b0c8cfd950109574a9633eb891bd6164ff1ad9a5 (diff) | |
| download | upstream-eccc01ab6c604c3b42948982e352771c04446d30.tar.gz upstream-eccc01ab6c604c3b42948982e352771c04446d30.tar.bz2 upstream-eccc01ab6c604c3b42948982e352771c04446d30.zip | |
upgrade to 2.6.28-rc8
SVN-Revision: 13591
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.28/091-ds1672_missing_id_table.patch | 21 | ||||
| -rw-r--r-- | target/linux/orion/Makefile | 2 |
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 |