diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 15:39:02 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 15:39:02 +0200 |
commit | aa77677e0a288e08073620db5d2a31df83ca4788 (patch) | |
tree | 0d14b995a21c43f365d66b9ad101a334109fc4e4 /drivers/staging/intel_sst | |
parent | efb8d21b2c6db3497655cc6a033ae8a9883e4063 (diff) | |
parent | 43a3beb6da994549ec28a9f31727b997a025f958 (diff) | |
download | op-kernel-dev-aa77677e0a288e08073620db5d2a31df83ca4788.zip op-kernel-dev-aa77677e0a288e08073620db5d2a31df83ca4788.tar.gz |
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
staging: et131x: Remove redundant check and return statement
staging: et131x: Mainly whitespace changes to appease checkpatch
staging: et131x: Remove last of the forward declarations
staging: et131x: Remove even more forward declarations
staging: et131x: Remove yet more forward declarations
staging: et131x: Remove more forward declarations
staging: et131x: Remove forward declaration of et131x_adapter_setup
staging: et131x: Remove some forward declarations
staging: et131x: Remove unused rx_ring.recv_packet_pool
staging: et131x: Remove call to find pci pm capability
staging: et131x: Remove redundant et131x_reset_recv() call
staging: et131x: Remove unused rx_ring.recv_buffer_pool
Staging: bcm: Fix three initialization errors in InterfaceDld.c
Staging: bcm: Fix coding style issues in InterfaceDld.c
staging:iio:dac: Add AD5360 driver
staging:iio:trigger:bfin-timer: Fix compile error
Staging: vt6655: add some range checks before memcpy()
Staging: vt6655: whitespace fixes to iotcl.c
Staging: vt6656: add some range checks before memcpy()
Staging: vt6656: whitespace cleanups in ioctl.c
...
Fix up conflicts in:
- drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
vg driver movement
- drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
driver removal vs now stale changes
- drivers/staging/rtl8192e/r8192E_core.c:
driver removal vs now stale changes
- drivers/staging/et131x/et131*:
driver consolidation into one file, tried to do fixups
Diffstat (limited to 'drivers/staging/intel_sst')
-rw-r--r-- | drivers/staging/intel_sst/intel_sst.c | 10 | ||||
-rw-r--r-- | drivers/staging/intel_sst/intel_sst_dsp.c | 2 | ||||
-rw-r--r-- | drivers/staging/intel_sst/intelmid.c | 1 |
3 files changed, 8 insertions, 5 deletions
diff --git a/drivers/staging/intel_sst/intel_sst.c b/drivers/staging/intel_sst/intel_sst.c index d892861..c303d85 100644 --- a/drivers/staging/intel_sst/intel_sst.c +++ b/drivers/staging/intel_sst/intel_sst.c @@ -321,7 +321,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 +524,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) { diff --git a/drivers/staging/intel_sst/intel_sst_dsp.c b/drivers/staging/intel_sst/intel_sst_dsp.c index a89e1ad..426d2b9 100644 --- a/drivers/staging/intel_sst/intel_sst_dsp.c +++ b/drivers/staging/intel_sst/intel_sst_dsp.c @@ -104,7 +104,7 @@ static int sst_start_mrst(void) /** * sst_start_medfield - Start the SST DSP processor * - * This starts the DSP in MRST platfroms + * This starts the DSP in Medfield platfroms */ static int sst_start_medfield(void) { diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c index 25656ad..492b660 100644 --- a/drivers/staging/intel_sst/intelmid.c +++ b/drivers/staging/intel_sst/intelmid.c @@ -27,6 +27,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/module.h> #include <linux/slab.h> #include <linux/io.h> #include <linux/platform_device.h> |