diff options
author | Pierre-Alexandre Meyer <pierre@mouraf.org> | 2009-04-26 14:35:56 -0700 |
---|---|---|
committer | Pierre-Alexandre Meyer <pierre@mouraf.org> | 2009-04-26 14:35:56 -0700 |
commit | 9c5868d154656e3832822dd24dd9701fe55eb2a4 (patch) | |
tree | 71d9da7b5f08f3544703653f958b126a93ca0945 /com32/hdt/hdt-cli-hdt.c | |
parent | d0a0e562d9554cb38650f64be6e9dab9c29d99de (diff) | |
parent | 7bd5d73a1b559935dae9f6b29703d71856554f3e (diff) | |
download | syslinux.git-9c5868d154656e3832822dd24dd9701fe55eb2a4.tar.gz syslinux.git-9c5868d154656e3832822dd24dd9701fe55eb2a4.tar.xz syslinux.git-9c5868d154656e3832822dd24dd9701fe55eb2a4.zip |
Merge branch 'disklib' into for-erwan
Conflicts:
com32/hdt/hdt-common.c
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Diffstat (limited to 'com32/hdt/hdt-cli-hdt.c')
-rw-r--r-- | com32/hdt/hdt-cli-hdt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/com32/hdt/hdt-cli-hdt.c b/com32/hdt/hdt-cli-hdt.c index 46f3669a..4f96b2da 100644 --- a/com32/hdt/hdt-cli-hdt.c +++ b/com32/hdt/hdt-cli-hdt.c @@ -285,6 +285,10 @@ struct cli_callback_descr list_hdt_show_modules[] = { .exec = main_show_cpu, }, { + .name = CLI_DISK, + .exec = main_show_disk, + }, + { .name = CLI_PXE, .exec = main_show_pxe, }, |