summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-05-10 18:15:49 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-05-10 18:15:49 +0200
commit8e8412601f5534abe5a57c4b6d62ab9fb5550ea9 (patch)
tree4f2285fdca21c2bcf11efd3c118aa3d84337b5c2 /arch
parentf44e7eebd5e3022af5659baf81fcdbfe5ce44268 (diff)
parent90df2a955e3c66fee2c59f67d9274e6a9addd9ce (diff)
downloadbarebox-8e8412601f5534abe5a57c4b6d62ab9fb5550ea9.tar.gz
barebox-8e8412601f5534abe5a57c4b6d62ab9fb5550ea9.tar.xz
Merge branch 'for-next/ctrlc'
Diffstat (limited to 'arch')
-rw-r--r--arch/sandbox/os/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
index 665e8194ef..a7ea8f2d3b 100644
--- a/arch/sandbox/os/common.c
+++ b/arch/sandbox/os/common.c
@@ -94,7 +94,7 @@ int linux_tstc(int fd)
return 0;
}
-int ctrlc(void)
+int arch_ctrlc(void)
{
char chr;