summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci/fdump.c
diff options
context:
space:
mode:
authorDmitry Torokhov2005-12-21 05:03:50 +0100
committerDmitry Torokhov2005-12-21 05:03:50 +0100
commit041387d98460b3947587929ef3a4773b8c48538f (patch)
tree3330eebba3fa1aa7c13479e527f07b03d7fb53ed /drivers/media/dvb/ttpci/fdump.c
parentInput: add the fn key to hid-debug.h (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadkernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.tar.gz
kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.tar.xz
kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.zip
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'drivers/media/dvb/ttpci/fdump.c')
-rw-r--r--drivers/media/dvb/ttpci/fdump.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttpci/fdump.c b/drivers/media/dvb/ttpci/fdump.c
index 0b478db3e744..c90001d35e7d 100644
--- a/drivers/media/dvb/ttpci/fdump.c
+++ b/drivers/media/dvb/ttpci/fdump.c
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
}
fprintf(fd_out, "\n};\n\n");
-
+
fclose(fd_in);
fclose(fd_out);