summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-02-09 15:38:30 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-02-09 15:38:33 +1100
commit4f8be9267b0a0136b6dfd765ec3079f2310c5411 (patch)
tree7b6757979947ea161a55e7d4f511d3eed3d8dbd8 /tools
parent2246214570b74b0fa79309f2db51b69cbaa90f47 (diff)
parente4df1ebdfeb4c68523046667b2d8ef8ab20ae066 (diff)
Merge remote-tracking branch 'gpio/for-next'
Diffstat (limited to 'tools')
-rw-r--r--tools/gpio/.gitignore4
-rw-r--r--tools/gpio/gpio-hammer.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/gpio/.gitignore b/tools/gpio/.gitignore
new file mode 100644
index 000000000000..9e9dd4b681b2
--- /dev/null
+++ b/tools/gpio/.gitignore
@@ -0,0 +1,4 @@
+gpio-event-mon
+gpio-hammer
+lsgpio
+
diff --git a/tools/gpio/gpio-hammer.c b/tools/gpio/gpio-hammer.c
index f1eab587dfea..4bcb234c0fca 100644
--- a/tools/gpio/gpio-hammer.c
+++ b/tools/gpio/gpio-hammer.c
@@ -38,7 +38,7 @@ int hammer_device(const char *device_name, unsigned int *lines, int nlines,
memset(&data.values, 0, sizeof(data.values));
ret = gpiotools_request_linehandle(device_name, lines, nlines,
GPIOHANDLE_REQUEST_OUTPUT, &data,
- "gpio-hammler");
+ "gpio-hammer");
if (ret < 0)
goto exit_error;
else