diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-14 10:45:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-14 10:45:20 +0100 |
| commit | fa6e05294759c29b3736010aa386928d24715feb (patch) | |
| tree | 3d75b2933fe5d5dbcfb2983d5147f8867bc0157a /drivers/video | |
| parent | 49bcf50125c661f45a030edd1a241917f1c7a821 (diff) | |
| parent | d93efdcd512a5b663cfb2da04afabd74af5d95b6 (diff) | |
Merge tag 'v3.10.48' into linux-linaro-lsk
This is the 3.10.48 stable release
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fb-puv3.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/fb-puv3.c b/drivers/video/fb-puv3.c index 27fc956166fa..520112531eb0 100644 --- a/drivers/video/fb-puv3.c +++ b/drivers/video/fb-puv3.c @@ -18,8 +18,10 @@ #include <linux/fb.h> #include <linux/init.h> #include <linux/console.h> +#include <linux/mm.h> #include <asm/sizes.h> +#include <asm/pgtable.h> #include <mach/hardware.h> /* Platform_data reserved for unifb registers. */ |