diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-14 22:33:20 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-14 22:33:20 +0100 |
commit | 932ec6cd7ae0fda0c186870c29c210a6afc8e692 (patch) | |
tree | 6b6d23fa45ec6c69c919fd469dfcfeb07532b4ec /services/surfaceflinger/DisplayHardware/HWComposer.cpp | |
parent | be13fc257596527d37e1f8b0c47a442cbbc8f551 (diff) | |
parent | 8af4e664d998a6d94d59b51bca47dd24ebf91d11 (diff) | |
download | frameworks_native-932ec6cd7ae0fda0c186870c29c210a6afc8e692.zip frameworks_native-932ec6cd7ae0fda0c186870c29c210a6afc8e692.tar.gz frameworks_native-932ec6cd7ae0fda0c186870c29c210a6afc8e692.tar.bz2 |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_native into replicant-6.0
Diffstat (limited to 'services/surfaceflinger/DisplayHardware/HWComposer.cpp')
-rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index b60687f..a43597a 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -37,7 +37,7 @@ #include <hardware/hardware.h> #include <hardware/hwcomposer.h> #ifdef QTI_BSP -#include <exhwcomposer_defs.h> +#include <hardware/display_defs.h> #endif #include <android/configuration.h> |