diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 10:44:22 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 10:44:22 -0800 |
| commit | 8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf (patch) | |
| tree | d4933996296141103b1f54e563268b23c95d6dd4 /drivers/staging/intel_sst | |
| parent | 412dc7f368bf10a8049a8a4c41abbfd0108742e7 (diff) | |
| parent | 72083646528d4887b920deb71b37e09bc7d227bb (diff) | |
| download | kernel_samsung_smdk4412-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.zip kernel_samsung_smdk4412-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.tar.gz kernel_samsung_smdk4412-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.tar.bz2 | |
Merge branch 'master' into work
Diffstat (limited to 'drivers/staging/intel_sst')
| -rw-r--r-- | drivers/staging/intel_sst/intel_sst_app_interface.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/intel_sst/intel_sst_app_interface.c b/drivers/staging/intel_sst/intel_sst_app_interface.c index 9618c79..9914400 100644 --- a/drivers/staging/intel_sst/intel_sst_app_interface.c +++ b/drivers/staging/intel_sst/intel_sst_app_interface.c @@ -34,7 +34,6 @@ #include <linux/uaccess.h> #include <linux/firmware.h> #include <linux/ioctl.h> -#include <linux/smp_lock.h> #ifdef CONFIG_MRST_RAR_HANDLER #include <linux/rar_register.h> #include "../../../drivers/staging/memrar/memrar.h" |