diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:21:36 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:30:18 +1100 |
| commit | 8b639e07efdb1b21ca60eeb3f8f5ac5038761200 (patch) | |
| tree | dd326f297c6c26c65477eea299667cf2d481fdd8 /drivers/staging/dream/camera/msm_vfe7x.c | |
| parent | 3a647a6ce4006ea8b84e4eaa6e18204cd911ed99 (diff) | |
| parent | 1f0f7a7df20bd69cb8553136613bda38dcddfcb1 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/net/wireless/Kconfig
Diffstat (limited to 'drivers/staging/dream/camera/msm_vfe7x.c')
| -rw-r--r-- | drivers/staging/dream/camera/msm_vfe7x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/dream/camera/msm_vfe7x.c b/drivers/staging/dream/camera/msm_vfe7x.c index 5de96c5d6352..33ab3ac6ac57 100644 --- a/drivers/staging/dream/camera/msm_vfe7x.c +++ b/drivers/staging/dream/camera/msm_vfe7x.c @@ -5,6 +5,7 @@ #include <linux/msm_adsp.h> #include <linux/uaccess.h> #include <linux/fs.h> +#include <linux/sched.h> #include <linux/android_pmem.h> #include <mach/msm_adsp.h> #include <linux/delay.h> |