Merge branch 'master' into for-next

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / staging / comedi / comedidev.h

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index c38ebb4aa75f32102af1b02492f7789242df81d3..4eb2b77f56dc55ef9442e00935094a630742318b 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -374,7 +374,9 @@ enum subdevice_runflags {
        SRF_RUNNING = 0x08000000
 };
 
-int comedi_check_chanlist(struct comedi_subdevice *s, int n, unsigned int *chanlist);
+int comedi_check_chanlist(struct comedi_subdevice *s,
+                         int n,
+                         unsigned int *chanlist);
 unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s);
 
 /* range stuff */