diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /target/lemote/files/boot | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'target/lemote/files/boot')
| -rw-r--r-- | target/lemote/files/boot/boot.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/lemote/files/boot/boot.cfg b/target/lemote/files/boot/boot.cfg index 63f740928..2f67fe67b 100644 --- a/target/lemote/files/boot/boot.cfg +++ b/target/lemote/files/boot/boot.cfg @@ -3,5 +3,5 @@ default 0 showmenu 1 title Linux - kernel /dev/fs/ext2@wd0/boot/lemote-mips-kernel + kernel /dev/fs/ext2@wd0/boot/lemote-encrypted-kernel args no_auto_cmd root=/dev/mapper/root resume=/dev/mapper/swap |