diff options
Diffstat (limited to 'common/main.c')
| -rw-r--r-- | common/main.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/common/main.c b/common/main.c index 6f475f0cc..8b6f274fa 100644 --- a/common/main.c +++ b/common/main.c @@ -392,13 +392,13 @@ static void process_boot_delay(void)  	debug ("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>");  	if (bootdelay != -1 && s && !abortboot(bootdelay)) { -#ifdef CONFIG_AUTOBOOT_KEYED +#if defined(CONFIG_AUTOBOOT_KEYED) && !defined(CONFIG_AUTOBOOT_KEYED_CTRLC)  		int prev = disable_ctrlc(1);	/* disable Control C checking */  #endif  		run_command_list(s, -1, 0); -#ifdef CONFIG_AUTOBOOT_KEYED +#if defined(CONFIG_AUTOBOOT_KEYED) && !defined(CONFIG_AUTOBOOT_KEYED_CTRLC)  		disable_ctrlc(prev);	/* restore Control C checking */  #endif  	} |