---

yaml --- r: 201940 b: refs/heads/master c: 39e1256 h: refs/heads/master v: v3
git-mirror · Aug 2, 2010 · 5caabdd · 5caabdd
1 parent 188fce3
commit 5caabdd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54b78608c6f4a30b4d64ec17bc36636c2a081506
+refs/heads/master: 39e1256bc4b85145b9db392e49a71cad43f6903b
diff --git a/trunk/drivers/staging/tm6000/tm6000-alsa.c b/trunk/drivers/staging/tm6000/tm6000-alsa.c
@@ -392,7 +392,7 @@ static int tm6000_audio_fini(struct tm6000_core *dev)
 }
 
 struct tm6000_ops audio_ops = {
-	.id	= TM6000_AUDIO,
+	.type	= TM6000_AUDIO,
 	.name	= "TM6000 Audio Extension",
 	.init	= tm6000_audio_init,
 	.fini	= tm6000_audio_fini,

diff --git a/trunk/drivers/staging/tm6000/tm6000-dvb.c b/trunk/drivers/staging/tm6000/tm6000-dvb.c
@@ -432,7 +432,7 @@ static int dvb_fini(struct tm6000_core *dev)
 }
 
 static struct tm6000_ops dvb_ops = {
-	.id	= TM6000_DVB,
+	.type	= TM6000_DVB,
 	.name	= "TM6000 dvb Extension",
 	.init	= dvb_init,
 	.fini	= dvb_fini,

diff --git a/trunk/drivers/staging/tm6000/tm6000.h b/trunk/drivers/staging/tm6000/tm6000.h
@@ -218,13 +218,15 @@ struct tm6000_core {
 	spinlock_t                   slock;
 };
 
-#define TM6000_AUDIO 0x10
-#define TM6000_DVB	0x20
+enum tm6000_ops_type {
+	TM6000_AUDIO = 0x10,
+	TM6000_DVB = 0x20,
+};
 
 struct tm6000_ops {
 	struct list_head	next;
 	char			*name;
-	int			id;
+	enum tm6000_ops_type	type;
 	int (*init)(struct tm6000_core *);
 	int (*fini)(struct tm6000_core *);
 };