diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
| commit | 94c0a7374ee0c980a34e134f93dca1d46e7af7bc (patch) | |
| tree | 134e5415fb5d2ccc613bdab46c97f5fa3df8c730 /target/lemote | |
| parent | 07c250a84c1cc9ace9ebf00800f2125461a2662b (diff) | |
| parent | 084c175e59e9ea61c68154ad9982adcd918cbfcf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/freeradius-server/Makefile
package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
Diffstat (limited to 'target/lemote')
| -rw-r--r-- | target/lemote/kernel.config | 5 | ||||
| -rw-r--r-- | target/lemote/target.mk | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/target/lemote/kernel.config b/target/lemote/kernel.config index f6188f044..b3bbfbf05 100644 --- a/target/lemote/kernel.config +++ b/target/lemote/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.35 -# Thu Aug 12 17:36:41 2010 +# Linux kernel version: 2.6.35.7 +# Sat Oct 16 10:47:40 2010 # CONFIG_MIPS=y @@ -1154,6 +1154,7 @@ CONFIG_LEMOTE_YEELOONG2F=y # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set +# CONFIG_AUFS_FS is not set CONFIG_FILE_LOCKING=y # CONFIG_FSNOTIFY is not set # CONFIG_DNOTIFY is not set diff --git a/target/lemote/target.mk b/target/lemote/target.mk index 85cade436..c29d3f212 100644 --- a/target/lemote/target.mk +++ b/target/lemote/target.mk @@ -1,7 +1,7 @@ ARCH:= mips CPU_ARCH:= mips64el -KERNEL_VERSION:= 2.6.35.4 +KERNEL_VERSION:= 2.6.35.7 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 0bb2cd59c13d7412f813c8fbc0769eec +KERNEL_MD5SUM:= f741879bcd3a5366a1bbe0ad5cdb7935 TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=loongson2f -mabi=64 |