aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/orion
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-06-11 11:59:45 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-06-11 11:59:45 +0000
commit057b87f6855c015c8cf3a03ae51c752a30d109a4 (patch)
tree7288c6930623f2195da013a237b291bd44605240 /target/linux/orion
parent2eb6751084190c5fc42566103811e0f72e291eb8 (diff)
downloadupstream-057b87f6855c015c8cf3a03ae51c752a30d109a4.tar.gz
upstream-057b87f6855c015c8cf3a03ae51c752a30d109a4.tar.bz2
upstream-057b87f6855c015c8cf3a03ae51c752a30d109a4.zip
upgrade orion to 2.6.26-rc5
SVN-Revision: 11436
Diffstat (limited to 'target/linux/orion')
-rw-r--r--target/linux/orion/Makefile2
-rw-r--r--target/linux/orion/config-default6
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
index 4cc509ad28..ff4dd8011e 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.26-rc4
+LINUX_VERSION:=2.6.26-rc5
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 4dc9ec58b2..da61cd3f28 100644
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -44,8 +44,8 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ARCH_VERSATILE is not set
CONFIG_ARM=y
# CONFIG_ARM_THUMB is not set
-# CONFIG_ARTHUR is not set
# CONFIG_ARPD is not set
+# CONFIG_ARTHUR is not set
CONFIG_ATA=m
# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_ATA_PIIX is not set
@@ -97,11 +97,10 @@ CONFIG_DLCI_MAX=8
CONFIG_DNOTIFY=y
# CONFIG_DSCC4 is not set
# CONFIG_E100 is not set
-# CONFIG_E1000 is not set
# CONFIG_E1000E_ENABLED is not set
# CONFIG_FARSYNC is not set
-# CONFIG_FPE_NWFPE is not set
# CONFIG_FPE_FASTFPE is not set
+# CONFIG_FPE_NWFPE is not set
CONFIG_FRAME_POINTER=y
CONFIG_FRAME_WARN=1024
CONFIG_FS_POSIX_ACL=y
@@ -342,6 +341,7 @@ CONFIG_USB=m
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_CATC is not set
CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_ISP1760_HCD is not set
# CONFIG_USB_KAWETH is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set