rda5876BT: fix commit error

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 2e2f2472f813d98a6b0e9f34057a91da643e2311..9a4ee8cfb9d61d55e078630d59c1546aa6dafe31 100755 (executable)
--- 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 79aaca45e2b583e44256f455f94a511898339264..4614251b5d6fb4d929cf5a29b6a64dd56d89aa93 100644 (file)
--- 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 7f9d03c0b6f921d17aaeb90bfff0337852aed778..8e160a0e2bd9b2f73f3bdddcd21a6b2911e7d9c2 100755 (executable)
--- 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;\r
 }\r
 \r
-int tcc_bt_power_control(int on_off)\r
+static int tcc_bt_power_control(int on_off)\r
 {\r
 //     volatile PGPIO pGPIO = (volatile PGPIO)tcc_p2v(HwGPIO_BASE);\r
     \r
@@ -187,7 +187,7 @@ static irqreturn_t rda_5876_host_wake_irq(int irq, void *dev)
        return IRQ_HANDLED;\r
 }\r
 \r
-int init_module(void)\r
+static int tcc_bt_init_module(void)\r
 {\r
     int ret;\r
 \r
@@ -256,7 +256,7 @@ int init_module(void)
     return 0;\r
 }\r
 \r
-void cleanup_module(void)\r
+static void tcc_bt_cleanup_module(void)\r
 {\r
        printk("[## BT ##] cleanup_module\n");\r
     unregister_chrdev(BT_DEV_MAJOR_NUM, DEV_NAME);\r
@@ -264,8 +264,8 @@ void cleanup_module(void)
 }\r
 \r
 \r
-late_initcall(init_module);\r
-module_exit(cleanup_module);\r
+late_initcall(tcc_bt_init_module);\r
+module_exit(tcc_bt_cleanup_module);\r
 \r
 \r
 MODULE_AUTHOR("Telechips Inc. linux@telechips.com");\r