aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-04-24 13:55:12 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-04-24 13:55:12 +0000
commit13bc5e26c93dcc9d99fe0f763271af0859f826ad (patch)
tree7da42e731b35bcecf1f462e1daa9cd5622208094 /target
parent426c91001ffca85fb8e8d06f655350b0478aa902 (diff)
downloadupstream-13bc5e26c93dcc9d99fe0f763271af0859f826ad.tar.gz
upstream-13bc5e26c93dcc9d99fe0f763271af0859f826ad.tar.bz2
upstream-13bc5e26c93dcc9d99fe0f763271af0859f826ad.zip
use 2.6.28 and remove uneeded patch
SVN-Revision: 15384
Diffstat (limited to 'target')
-rw-r--r--target/linux/rb532/Makefile2
-rw-r--r--target/linux/rb532/patches-2.6.28/020-rc32434_res_name.patch12
2 files changed, 1 insertions, 13 deletions
diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile
index e35b81c7f1..e292a4e4af 100644
--- a/target/linux/rb532/Makefile
+++ b/target/linux/rb532/Makefile
@@ -11,7 +11,7 @@ BOARD:=rb532
BOARDNAME:=Mikrotik RouterBoard 532
FEATURES:=jffs2 pci tgz
-LINUX_VERSION:=2.6.24.7
+LINUX_VERSION:=2.6.28.9
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += hostapd-mini kmod-madwifi
diff --git a/target/linux/rb532/patches-2.6.28/020-rc32434_res_name.patch b/target/linux/rb532/patches-2.6.28/020-rc32434_res_name.patch
deleted file mode 100644
index e61ec8330a..0000000000
--- a/target/linux/rb532/patches-2.6.28/020-rc32434_res_name.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN linux-2.6.27.5/drivers/watchdog/rc32434_wdt.c linux-2.6.27.5.new/drivers/watchdog/rc32434_wdt.c
---- linux-2.6.27.5/drivers/watchdog/rc32434_wdt.c 2008-11-07 18:55:34.000000000 +0100
-+++ linux-2.6.27.5.new/drivers/watchdog/rc32434_wdt.c 2008-11-15 22:06:28.000000000 +0100
-@@ -261,7 +261,7 @@
- int ret;
- struct resource *r;
-
-- r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rb500_wdt_res");
-+ r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rb532_wdt_res");
- if (!r) {
- printk(KERN_ERR KBUILD_MODNAME
- "failed to retrieve resources\n");