Merge branch 'fixes-modulesplit' into fixes

[pandora-kernel.git] / drivers / staging / intel_sst / intel_sst.c

diff --git a/drivers/staging/intel_sst/intel_sst.c b/drivers/staging/intel_sst/intel_sst.c
index d892861..ff9aaec 100644 (file)
--- a/drivers/staging/intel_sst/intel_sst.c
+++ b/drivers/staging/intel_sst/intel_sst.c
@@ -37,6 +37,7 @@
 #include <linux/firmware.h>
 #include <linux/miscdevice.h>
 #include <linux/pm_runtime.h>
+#include <linux/module.h>
 #include <asm/mrst.h>
 #include "intel_sst.h"
 #include "intel_sst_ioctl.h"
@@ -321,7 +322,7 @@ static int __devinit intel_sst_probe(struct pci_dev *pci,
                if (ret) {
                        pr_err("couldn't register LPE device\n");
                        goto do_free_misc;
-               }
+               }
        } else if (sst_drv_ctx->pci_id == SST_MFLD_PCI_ID) {
                u32 csr;
 
@@ -524,9 +525,11 @@ int intel_sst_resume(struct pci_dev *pci)
        return 0;
 }
 
-/* The runtime_suspend/resume is pretty much similar to the legacy suspend/resume with the noted exception below:
- * The PCI core takes care of taking the system through D3hot and restoring it back to D0 and so there is
- * no need to duplicate that here.
+/* The runtime_suspend/resume is pretty much similar to the legacy
+ * suspend/resume with the noted exception below:
+ * The PCI core takes care of taking the system through D3hot and
+ * restoring it back to D0 and so there is no need to duplicate
+ * that here.
  */
 static int intel_sst_runtime_suspend(struct device *dev)
 {