[PATCH 4/25] UBUNTU hardy-lum lpia branch sync

[Steve Conklin]

>From f14f4f189247fa3d5411f46e9f244cb9d126aa1d Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky at linuxtv.org>
Date: Fri, 6 Mar 2009 11:30:02 -0500
Subject: [PATCH] UBUNTU: sms1xxx: move definition of struct smsdvb_client_t into smsdvb.c
 OriginalAuthor: Michael Krufky <mkrufky at linuxtv.org>
 OriginalLocation: http://linuxtv.org/hg/v4l-dvb/rev/577dc4ca1324

Nobody uses struct smsdvb_client_t other than smsdvb.c --
this does not need to be inside smscoreapi.h

Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
---
 ubuntu/media/sms1xxx/smscoreapi.h |   21 ---------------------
 ubuntu/media/sms1xxx/smsdvb.c     |   20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/ubuntu/media/sms1xxx/smscoreapi.h b/ubuntu/media/sms1xxx/smscoreapi.h
index 768a296..266881e 100644
--- a/ubuntu/media/sms1xxx/smscoreapi.h
+++ b/ubuntu/media/sms1xxx/smscoreapi.h
@@ -534,27 +534,6 @@ struct smscore_gpio_config {
 	u8 outputdriving;
 };
 
-struct smsdvb_client_t {
-	struct list_head entry;
-
-	struct smscore_device_t	*coredev;
-	struct smscore_client_t	*smsclient;
-
-	struct dvb_adapter	adapter;
-	struct dvb_demux	demux;
-	struct dmxdev		dmxdev;
-	struct dvb_frontend	frontend;
-
-	fe_status_t		fe_status;
-	int			fe_ber, fe_snr, fe_unc, fe_signal_strength;
-
-	struct completion	tune_done, stat_done;
-
-	/* todo: save freq/band instead whole struct */
-	struct dvb_frontend_parameters fe_params;
-
-};
-
 extern void smscore_registry_setmode(char *devpath, int mode);
 extern int smscore_registry_getmode(char *devpath);
 
diff --git a/ubuntu/media/sms1xxx/smsdvb.c b/ubuntu/media/sms1xxx/smsdvb.c
index d742d07..7266f3d 100644
--- a/ubuntu/media/sms1xxx/smsdvb.c
+++ b/ubuntu/media/sms1xxx/smsdvb.c
@@ -29,6 +29,26 @@
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 #endif
 
+struct smsdvb_client_t {
+	struct list_head entry;
+
+	struct smscore_device_t *coredev;
+	struct smscore_client_t *smsclient;
+
+	struct dvb_adapter      adapter;
+	struct dvb_demux        demux;
+	struct dmxdev           dmxdev;
+	struct dvb_frontend     frontend;
+
+	fe_status_t             fe_status;
+	int                     fe_ber, fe_snr, fe_unc, fe_signal_strength;
+
+	struct completion       tune_done, stat_done;
+
+	/* todo: save freq/band instead whole struct */
+	struct dvb_frontend_parameters fe_params;
+};
+
 static struct list_head g_smsdvb_clients;
 static struct mutex g_smsdvb_clientslock;
 
-- 
1.5.6.3