summaryrefslogtreecommitdiff
path: root/drivers/media/usb/pvrusb2/pvrusb2-debugifc.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-02-26 14:24:50 +0300
committerIngo Molnar <mingo@kernel.org>2015-02-26 14:24:50 +0300
commite9e4e44309f866b115d08ab4a54834008c50a8a4 (patch)
treeae9f91e682a4d6592ef263f30a4a0b1a862b7987 /drivers/media/usb/pvrusb2/pvrusb2-debugifc.c
parent8a26ce4e544659256349551283414df504889a59 (diff)
parentc517d838eb7d07bbe9507871fab3931deccff539 (diff)
downloadlinux-e9e4e44309f866b115d08ab4a54834008c50a8a4.tar.xz
Merge tag 'v4.0-rc1' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/usb/pvrusb2/pvrusb2-debugifc.c')
-rw-r--r--drivers/media/usb/pvrusb2/pvrusb2-debugifc.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-debugifc.c b/drivers/media/usb/pvrusb2/pvrusb2-debugifc.c
index 4279ebb811a1..e4022bcb155b 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-debugifc.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-debugifc.c
@@ -322,14 +322,3 @@ int pvr2_debugifc_docmd(struct pvr2_hdw *hdw,const char *buf,
return 0;
}
-
-
-/*
- Stuff for Emacs to see, in order to encourage consistent editing style:
- *** Local Variables: ***
- *** mode: c ***
- *** fill-column: 75 ***
- *** tab-width: 8 ***
- *** c-basic-offset: 8 ***
- *** End: ***
- */