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

[Steve Conklin]

>From ded2af42cd7d47e25cb9c0072ea2fa0b7809191f Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky at linuxtv.org>
Date: Fri, 6 Mar 2009 15:30:08 -0500
Subject: [PATCH] UBUNTU: sms1xxx: register smsnet and smschar device drivers
 OriginalAuthor: Michael Krufky <mkrufky at linuxtv.org>

The new code was added but is inactive until we call the _register() functions

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

diff --git a/ubuntu/media/sms1xxx/smscoreapi.c b/ubuntu/media/sms1xxx/smscoreapi.c
index faaeb68..0faa011 100644
--- a/ubuntu/media/sms1xxx/smscoreapi.c
+++ b/ubuntu/media/sms1xxx/smscoreapi.c
@@ -1481,7 +1481,7 @@ static int __init smscore_module_init(void)
 	INIT_LIST_HEAD(&g_smscore_registry);
 	kmutex_init(&g_smscore_registrylock);
 
-#if 0 /* def SMS_CHAR_CLIENT */
+#if 1 /* def SMS_CHAR_CLIENT */
 	/* Char interface Register */
 	rc = smschar_register();
 	if (rc) {
@@ -1499,7 +1499,7 @@ static int __init smscore_module_init(void)
 	}
 #endif
 
-#if 0 /* def SMS_NET_CLIENT */
+#if 1 /* def SMS_NET_CLIENT */
 	/* DVB Register */
 	rc = smsnet_register();
 	if (rc) {
@@ -1530,7 +1530,7 @@ static int __init smscore_module_init(void)
 #if 0
 sms_bus_drv_error:
 #endif /* 0 */
-#if 0 /* def SMS_NET_CLIENT */
+#if 1 /* def SMS_NET_CLIENT */
 	smsnet_unregister();
 smsnet_error:
 #endif
@@ -1538,7 +1538,7 @@ smsnet_error:
 	smsdvb_unregister();
 smsdvb_error:
 #endif
-#if 0 /* def SMS_CHAR_CLIENT */
+#if 1 /* def SMS_CHAR_CLIENT */
 	smschar_unregister();
 smschar_error:
 #endif
@@ -1549,7 +1549,7 @@ smschar_error:
 
 static void __exit smscore_module_exit(void)
 {
-#if 0 /* def SMS_CHAR_CLIENT */
+#if 1 /* def SMS_CHAR_CLIENT */
 	/* Char interface UnRegister */
 	smschar_unregister();
 #endif
@@ -1559,7 +1559,7 @@ static void __exit smscore_module_exit(void)
 	smsdvb_unregister();
 #endif
 
-#if 0 /* def SMS_NET_CLIENT */
+#if 1 /* def SMS_NET_CLIENT */
 	/* NET UnRegister */
 	smsnet_unregister();
 #endif
diff --git a/ubuntu/media/sms1xxx/smscoreapi.h b/ubuntu/media/sms1xxx/smscoreapi.h
index d944b51..16bc868 100644
--- a/ubuntu/media/sms1xxx/smscoreapi.h
+++ b/ubuntu/media/sms1xxx/smscoreapi.h
@@ -608,6 +608,14 @@ int smscore_led_state(struct smscore_device_t *core, int led);
 
 /* ------------------------------------------------------------------------ */
 
+int smschar_register(void);
+int smsnet_register(void);
+
+void smsnet_unregister(void);
+void smschar_unregister(void);
+
+/* ------------------------------------------------------------------------ */
+
 #define DBG_INFO 1
 #define DBG_ADV  2
 
-- 
1.5.6.3