diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-06-11 11:59:45 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-06-11 11:59:45 +0000 |
| commit | a240b4c3669e2394c7204fb076bef7cb9f554ed5 (patch) | |
| tree | 747209c894db74122e0e8a7eff8ab40de51e72ed /target/linux/orion | |
| parent | db81fa946e732300f7cdae8bed41ba0a99a99d08 (diff) | |
| download | master-187ad058-a240b4c3669e2394c7204fb076bef7cb9f554ed5.tar.gz master-187ad058-a240b4c3669e2394c7204fb076bef7cb9f554ed5.tar.bz2 master-187ad058-a240b4c3669e2394c7204fb076bef7cb9f554ed5.zip | |
upgrade orion to 2.6.26-rc5
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11436 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/orion')
| -rw-r--r-- | target/linux/orion/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/orion/config-default | 6 |
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 |