4 files changed, 12 insertions, 12 deletions
diff --git a/linux/drivers/media/video/saa7134/Makefile b/linux/drivers/media/video/saa7134/Makefile
index b339d5773..134f83a96 100644
--- a/linux/drivers/media/video/saa7134/Makefile
+++ b/linux/drivers/media/video/saa7134/Makefile
@@ -3,8 +3,9 @@ saa7134-objs :=	saa7134-cards.o saa7134-core.o saa7134-i2c.o	\
 		saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o    \
 		saa7134-video.o saa7134-input.o
 
-obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o
-obj-$(CONFIG_VIDEO_SAA7134) += saa7134-alsa.o saa7134-oss.o
+obj-$(CONFIG_VIDEO_SAA7134) +=  saa7134.o saa7134-empress.o \
+				saa6752hs.o saa7134-alsa.o \
+				saa7134-oss.o
 obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
 
 EXTRA_CFLAGS += -I$(src)/..
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c
index 04417b127..cda102e9c 100644
--- a/linux/drivers/media/video/saa7134/saa7134-core.c
+++ b/linux/drivers/media/video/saa7134/saa7134-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-core.c,v 1.58 2005/12/04 21:06:50 mkrufky Exp $
+ * $Id: saa7134-core.c,v 1.59 2005/12/07 12:30:28 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * driver core
@@ -252,7 +252,6 @@ static int need_empress;
 static int need_dvb;
 static int need_alsa;
 static int need_oss;
-static int pending_registered=0;
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 #define request_module_depend(name,flag) request_module(name);
@@ -274,6 +273,7 @@ static int pending_call(struct notifier_block *self, unsigned long state,
 	return NOTIFY_DONE;
 }
 
+static int pending_registered=0;
 static struct notifier_block pending_notifier = {
 	.notifier_call = pending_call,
 };
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c
index d4f547fe9..613254d11 100644
--- a/linux/drivers/media/video/saa7134/saa7134-input.c
+++ b/linux/drivers/media/video/saa7134/saa7134-input.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-input.c,v 1.45 2005/12/04 01:12:43 rmcc Exp $
+ * $Id: saa7134-input.c,v 1.46 2005/12/07 12:30:28 mchehab Exp $
  *
  * handle saa7134 IR remotes via linux kernel input layer.
  *
@@ -726,14 +726,14 @@ int saa7134_input_init1(struct saa7134_dev *dev)
 		return -ENOMEM;
 	}
 
+	ir->dev = input_dev;
+
 	/* init hardware-specific stuff */
 	ir->mask_keycode = mask_keycode;
 	ir->mask_keydown = mask_keydown;
 	ir->mask_keyup   = mask_keyup;
 	ir->polling      = polling;
 
-	ir->dev      	 = input_dev;
-
 	/* init input device */
 	snprintf(ir->name, sizeof(ir->name), "saa7134 IR (%s)",
 		 saa7134_boards[dev->board].name);
diff --git a/linux/drivers/media/video/saa7134/saa7134-oss.c b/linux/drivers/media/video/saa7134/saa7134-oss.c
index 00f41642c..beab9a86a 100644
--- a/linux/drivers/media/video/saa7134/saa7134-oss.c
+++ b/linux/drivers/media/video/saa7134/saa7134-oss.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-oss.c,v 1.29 2005/11/20 15:50:31 mchehab Exp $
+ * $Id: saa7134-oss.c,v 1.30 2005/12/07 12:30:28 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * oss dsp interface
@@ -30,7 +30,6 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
-#include <linux/interrupt.h>
 #include <linux/sound.h>
 #include <linux/soundcard.h>
 
@@ -983,12 +982,12 @@ static int saa7134_oss_init(void)
 		}
 	}
 
-	dmasound_init = oss_device_init;
-	dmasound_exit = oss_device_exit;
-
 	if (dev == NULL)
 		printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n");
 
+	dmasound_init = oss_device_init;
+	dmasound_exit = oss_device_exit;
+
 	return 0;
 
 }