summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-17 21:25:07 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-17 21:25:07 -0300
commitaa6d98fa9c3ec7360f92a16516e75ed2ede3ebbc (patch)
tree393e92e1fc1b5a660c3cb8595be07fd6fe761a87 /linux/drivers/media/video
parent718d0b0d28a8a8bc854fa0d5c350ef35e38d36d0 (diff)
downloadmediapointer-dvb-s2-aa6d98fa9c3ec7360f92a16516e75ed2ede3ebbc.tar.gz
mediapointer-dvb-s2-aa6d98fa9c3ec7360f92a16516e75ed2ede3ebbc.tar.bz2
Sync with whitespaces on -git
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/saa7127.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7127.c b/linux/drivers/media/video/saa7127.c
index ca88dd325..0b126a849 100644
--- a/linux/drivers/media/video/saa7127.c
+++ b/linux/drivers/media/video/saa7127.c
@@ -722,9 +722,10 @@ static int saa7127_probe(struct i2c_client *client,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
if (id->driver_data) { /* Chip type is already known */
state->ident = id->driver_data;
- } else /* Needs detection */
-#endif
+ } else { /* Needs detection */
+#else
{
+#endif
int read_result;
/* Detect if it's an saa7129 */