diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:46:22 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:46:22 +0800 |
| commit | 1c4a401e4961ffda3c432504e69d12316cfdbdf3 (patch) | |
| tree | 1fa2157f1d2712a7f838eadd236e35681957c323 /drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/linux/ump_ioctl.h | |
| parent | c65e9ef43160d318d715d5a1c8752864aace85f0 (diff) | |
| parent | fcddfa7f1d6cbdd5b841665b2337422627394cff (diff) | |
Merge topic branch 'mali-android' into integration-android-ux500
Diffstat (limited to 'drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/linux/ump_ioctl.h')
| -rw-r--r-- | drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/linux/ump_ioctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/linux/ump_ioctl.h b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/linux/ump_ioctl.h index b11429816ab..0c0ff6f6272 100644 --- a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/linux/ump_ioctl.h +++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/linux/ump_ioctl.h @@ -19,7 +19,7 @@ extern "C" #include <linux/types.h> #include <linux/ioctl.h> -#include "../common/ump_uk_types.h" +#include <ump_uk_types.h> #ifndef __user #define __user |