diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-07 13:47:56 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-07 13:47:56 -0500 |
| commit | ea3398a1ae54cd3403f3cc0f6aa498c7452c681a (patch) | |
| tree | 19903cfd3eb11f6cdd84f3b6923e604028178150 /drivers/staging/intel_sst/intel_sst_app_interface.c | |
| parent | 03fa6fc5a68242ddd7cc3ba4255fe6f65b21ce41 (diff) | |
| parent | cf7d7e5a1980d1116ee152d25dac382b112b9c17 (diff) | |
Staging: Merge 2.6.37-rc5 into staging-next
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly. It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/intel_sst/intel_sst_app_interface.c')
| -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 ce2c755a176..a367991d560 100644 --- a/drivers/staging/intel_sst/intel_sst_app_interface.c +++ b/drivers/staging/intel_sst/intel_sst_app_interface.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | #include <linux/firmware.h> | 37 | #include <linux/firmware.h> |
| 38 | #include <linux/pm_runtime.h> | 38 | #include <linux/pm_runtime.h> |
| 39 | #include <linux/ioctl.h> | 39 | #include <linux/ioctl.h> |
| 40 | #include <linux/smp_lock.h> | ||
| 41 | #ifdef CONFIG_MRST_RAR_HANDLER | 40 | #ifdef CONFIG_MRST_RAR_HANDLER |
| 42 | #include <linux/rar_register.h> | 41 | #include <linux/rar_register.h> |
| 43 | #include "../../../drivers/staging/memrar/memrar.h" | 42 | #include "../../../drivers/staging/memrar/memrar.h" |