diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-07 11:57:51 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-07 11:57:51 +0100 |
| commit | 32f9b1079a6ee088fce727b6827b6f1693ca8c0c (patch) | |
| tree | d3fa3a705d06be11bea601891ea3a60bbeb22591 /lib | |
| parent | c56fdbbc37cf676b42bbbf8d0efd0b78df4aed22 (diff) | |
| parent | e4e1fd5f36b3c8170f3a9ac75e433ddff3d5e447 (diff) | |
| download | barebox-32f9b1079a6ee088fce727b6827b6f1693ca8c0c.tar.gz barebox-32f9b1079a6ee088fce727b6827b6f1693ca8c0c.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/copy_file.c | 1 | ||||
| -rw-r--r-- | lib/kfifo.c | 1 | ||||
| -rw-r--r-- | lib/notifier.c | 1 | ||||
| -rw-r--r-- | lib/process_escape_sequence.c | 1 | ||||
| -rw-r--r-- | lib/show_progress.c | 1 |
6 files changed, 1 insertions, 6 deletions
diff --git a/lib/Makefile b/lib/Makefile index e1db99b95b..e8769a9be2 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -9,7 +9,7 @@ obj-y += misc.o obj-$(CONFIG_PARAMETER) += parameter.o obj-y += xfuncs.o obj-y += getopt.o -obj-y += readkey.o +obj-y += readkey.o obj-y += kfifo.o obj-y += libbb.o obj-y += libgen.o diff --git a/lib/copy_file.c b/lib/copy_file.c index 778cc00901..fdd0cacb40 100644 --- a/lib/copy_file.c +++ b/lib/copy_file.c @@ -84,4 +84,3 @@ out: return ret; } - diff --git a/lib/kfifo.c b/lib/kfifo.c index afd389409c..307dae1441 100644 --- a/lib/kfifo.c +++ b/lib/kfifo.c @@ -153,4 +153,3 @@ unsigned int kfifo_getc(struct kfifo *fifo, unsigned char *c) return 0; } - diff --git a/lib/notifier.c b/lib/notifier.c index a2aac53c20..9eb734e504 100644 --- a/lib/notifier.c +++ b/lib/notifier.c @@ -56,4 +56,3 @@ int clock_notifier_call_chain(void) { return notifier_call_chain(&clock_notifier_list, 0, NULL); } - diff --git a/lib/process_escape_sequence.c b/lib/process_escape_sequence.c index 47a7e5cd92..1bfd0702f5 100644 --- a/lib/process_escape_sequence.c +++ b/lib/process_escape_sequence.c @@ -80,4 +80,3 @@ int process_escape_sequence(const char *source, char *dest, int destlen) dest[i] = 0; return 0; } - diff --git a/lib/show_progress.c b/lib/show_progress.c index 98dc8495b4..f9aa1a945e 100644 --- a/lib/show_progress.c +++ b/lib/show_progress.c @@ -62,4 +62,3 @@ void init_progression_bar(int max) else printf("\t"); } - |