Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[net-next-2.6.git] / drivers / staging / cx25821 / cx25821-audio.h

diff --git a/drivers/staging/cx25821/cx25821-audio.h b/drivers/staging/cx25821/cx25821-audio.h
index aa5725b093283bece1bc03556fc8039e1751ccbe..27717253227dab838d6884677a2d986b7f53618d 100644 (file)
--- a/drivers/staging/cx25821/cx25821-audio.h
+++ b/drivers/staging/cx25821/cx25821-audio.h
@@ -31,21 +31,18 @@
 #define NUMBER_OF_PROGRAMS  8
 
 /*
-* Max size of the RISC program for a buffer. - worst case is 2 writes per line
-* Space is also added for the 4 no-op instructions added on the end.
-*/
+ * Max size of the RISC program for a buffer. - worst case is 2 writes per line
+ * Space is also added for the 4 no-op instructions added on the end.
+ */
 #ifndef USE_RISC_NOOP
-#define MAX_BUFFER_PROGRAM_SIZE                \
-(2*LINES_PER_BUFFER*RISC_WRITE_INSTRUCTION_SIZE +      \
-                       RISC_WRITECR_INSTRUCTION_SIZE*4)
-
+#define MAX_BUFFER_PROGRAM_SIZE     \
+       (2*LINES_PER_BUFFER*RISC_WRITE_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE*4)
 #endif
 
 /* MAE 12 July 2005 Try to use NOOP RISC instruction instead */
 #ifdef USE_RISC_NOOP
 #define MAX_BUFFER_PROGRAM_SIZE     \
-(2*LINES_PER_BUFFER*RISC_WRITE_INSTRUCTION_SIZE + RISC_NOOP_INSTRUCTION_SIZE*4l)
-
+       (2*LINES_PER_BUFFER*RISC_WRITE_INSTRUCTION_SIZE + RISC_NOOP_INSTRUCTION_SIZE*4)
 #endif
 
 /* Sizes of various instructions in bytes.  Used when adding instructions. */