On Tue, May 23, 2017 at 2:49 PM, Rob Herring <r...@kernel.org> wrote: > Support for Android 4.4 and earlier has already been removed from mesa. > Remove this remaining piece from nouveau, too. > > Signed-off-by: Rob Herring <r...@kernel.org> > --- > .../drivers/nouveau/codegen/unordered_set.h | 32 > ++-------------------- > 1 file changed, 2 insertions(+), 30 deletions(-)
I missed this hunk: diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp index 193628cfbda8..b33d7b4010d8 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp @@ -37,11 +37,9 @@ namespace nv50_ir { #if __cplusplus >= 201103L using std::hash; using std::unordered_map; -#elif !defined(ANDROID) +#else using std::tr1::hash; using std::tr1::unordered_map; -#else -#error Android release before Lollipop is not supported! #endif #define MAX_REGISTER_FILE_SIZE 256 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev