From: wdc <wdc@rock-chips.com>
Date: Tue, 23 Apr 2013 10:49:29 +0000 (+0800)
Subject: rda5876BT: fix commit error
X-Git-Tag: firefly_0821_release~7231
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0188848a9fd4a783016306376311a33ef99132dc;p=firefly-linux-kernel-4.4.55.git

rda5876BT: fix commit error
---

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 2e2f2472f813..9a4ee8cfb9d6 100755
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -399,6 +399,16 @@ config SENSORS_AK8975
 	  If you say yes here you get support for Asahi Kasei's
 	  orientation sensor AK8975.
 
+
+config SENSORS_AK8963
+       tristate "AK8963 compass support"
+       default n
+       depends on I2C
+       help
+         If you say yes here you get support for Asahi Kasei's
+         orientation sensor AK8963.
+
+
 config EP93XX_PWM
 	tristate "EP93xx PWM support"
 	depends on ARCH_EP93XX
@@ -561,5 +571,5 @@ source "drivers/misc/lis3lv02d/Kconfig"
 source "drivers/misc/carma/Kconfig"
 source "drivers/misc/bp/Kconfig"
 source "drivers/misc/rk2928_callpad_misc/Kconfig"
-
+source "drivers/misc/3g_module/Kconfig"
 endif # MISC_DEVICES
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 79aaca45e2b5..4614251b5d6f 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -50,6 +50,7 @@ obj-y				+= carma/
 obj-$(CONFIG_WL127X_RFKILL)	+= wl127x-rfkill.o
 obj-$(CONFIG_APANIC)		+= apanic.o
 obj-$(CONFIG_SENSORS_AK8975)	+= akm8975.o
+obj-$(CONFIG_SENSORS_AK8963)   += akm8963.o
 obj-$(CONFIG_MTK23D)		+= mtk23d.o
 obj-$(CONFIG_FM580X)		+= fm580x.o
 obj-$(CONFIG_RK29_SUPPORT_MODEM)	+= rk29_modem/
diff --git a/drivers/misc/tcc_bt_dev.c b/drivers/misc/tcc_bt_dev.c
index 7f9d03c0b6f9..8e160a0e2bd9 100755
--- a/drivers/misc/tcc_bt_dev.c
+++ b/drivers/misc/tcc_bt_dev.c
@@ -81,7 +81,7 @@ static int tcc_bt_dev_release(struct inode *inode, struct file *file)
     	return 0;
 }
 
-int tcc_bt_power_control(int on_off)
+static int tcc_bt_power_control(int on_off)
 {
 //	volatile PGPIO pGPIO = (volatile PGPIO)tcc_p2v(HwGPIO_BASE);
     
@@ -187,7 +187,7 @@ static irqreturn_t rda_5876_host_wake_irq(int irq, void *dev)
 	return IRQ_HANDLED;
 }
 
-int init_module(void)
+static int tcc_bt_init_module(void)
 {
     int ret;
 
@@ -256,7 +256,7 @@ int init_module(void)
     return 0;
 }
 
-void cleanup_module(void)
+static void tcc_bt_cleanup_module(void)
 {
 	printk("[## BT ##] cleanup_module\n");
     unregister_chrdev(BT_DEV_MAJOR_NUM, DEV_NAME);
@@ -264,8 +264,8 @@ void cleanup_module(void)
 }
 
 
-late_initcall(init_module);
-module_exit(cleanup_module);
+late_initcall(tcc_bt_init_module);
+module_exit(tcc_bt_cleanup_module);
 
 
 MODULE_AUTHOR("Telechips Inc. linux@telechips.com");