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

[Steve Conklin]

>From 159ffa658c3a24737fcab167acd4a85632332b34 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky at linuxtv.org>
Date: Fri, 6 Mar 2009 13:39:44 -0500
Subject: [PATCH] UBUNTU: sms1xxx: update build system and fix build errors
 OriginalAuthor: Michael Krufky <mkrufky at linuxtv.org>

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

diff --git a/ubuntu/media/sms1xxx/Makefile b/ubuntu/media/sms1xxx/Makefile
index 5e13623..c1eaf1f 100644
--- a/ubuntu/media/sms1xxx/Makefile
+++ b/ubuntu/media/sms1xxx/Makefile
@@ -1,8 +1,10 @@
 include $(src)/../../.config
 
-sms1xxx-objs := smscoreapi.o smsusb.o smsdvb.o sms-cards.o
+sms1xxx-objs := smscoreapi.o sms-cards.o smschar.o smsnet.o
 
 obj-$(CONFIG_DVB_SIANO_SMS1XXX) += sms1xxx.o
+obj-$(CONFIG_DVB_SIANO_SMS1XXX) += smsusb.o
+obj-$(CONFIG_DVB_SIANO_SMS1XXX) += smsdvb.o
 
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 
diff --git a/ubuntu/media/sms1xxx/smscoreapi.c b/ubuntu/media/sms1xxx/smscoreapi.c
index dbf3de8..faaeb68 100644
--- a/ubuntu/media/sms1xxx/smscoreapi.c
+++ b/ubuntu/media/sms1xxx/smscoreapi.c
@@ -1224,7 +1224,6 @@ int smsclient_sendrequest(struct smscore_client_t *client,
 }
 EXPORT_SYMBOL_GPL(smsclient_sendrequest);
 
-#if 0
 /**
  * return the size of large (common) buffer
  *
@@ -1245,8 +1244,8 @@ int smscore_get_common_buffer_size(struct smscore_device_t *coredev)
  *
  * @return 0 on success, <0 on error.
  */
-static int smscore_map_common_buffer(struct smscore_device_t *coredev,
-				     struct vm_area_struct *vma)
+int smscore_map_common_buffer(struct smscore_device_t *coredev,
+			      struct vm_area_struct *vma)
 {
 	unsigned long end = vma->vm_end,
 		      start = vma->vm_start,
@@ -1273,7 +1272,6 @@ static int smscore_map_common_buffer(struct smscore_device_t *coredev,
 
 	return 0;
 }
-#endif
 
 static int get_gpio_pin_params(u32 pin, u32 *translatedpin,
 			       u32 *groupnum, u32 *groupcfg)
-- 
1.5.6.3