Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / arch / x86 / platform / intel-mid / sfi.c

diff --git a/arch/x86/platform/intel-mid/sfi.c b/arch/x86/platform/intel-mid/sfi.c
index e8f68f65208778c9c5aefa2a1e1dc0f6d5185829..19b43e3a9f0fe138709ebfcd54a0eda8ce544e4c 100644 (file)
--- a/arch/x86/platform/intel-mid/sfi.c
+++ b/arch/x86/platform/intel-mid/sfi.c
@@ -15,7 +15,6 @@
 #include <linux/interrupt.h>
 #include <linux/scatterlist.h>
 #include <linux/sfi.h>
-#include <linux/intel_pmic_gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/i2c.h>
 #include <linux/skbuff.h>
@@ -226,7 +225,7 @@ int get_gpio_by_name(const char *name)
        return -EINVAL;
 }
 
-void __init intel_scu_device_register(struct platform_device *pdev)
+static void __init intel_scu_ipc_device_register(struct platform_device *pdev)
 {
        if (ipc_next_dev == MAX_IPCDEVS)
                pr_err("too many SCU IPC devices");
@@ -361,7 +360,7 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry,
 
        pdev->dev.platform_data = pdata;
        if (dev->delay)
-               intel_scu_device_register(pdev);
+               intel_scu_ipc_device_register(pdev);
        else
                platform_device_add(pdev);
 }