From 2e59788aa9be6dab49e06588fcb1cf812e55a0cf Mon Sep 17 00:00:00 2001
From: "V.VamsiKrishna" <vk@bsb.in>
Date: Fri, 20 Mar 2015 11:12:59 +0530
Subject: [PATCH] Revert "Missed some things in prev commit."

This reverts commit d3280f91a13da6c106f95c289c095714c638d201.
---
 SConstruct                        | 2 --
 drivers/etc1/SCsub                | 3 +--
 drivers/register_driver_types.cpp | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/SConstruct b/SConstruct
index cb32c0b5fff9..2dc9fa1e704e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -307,8 +307,6 @@ if selected_platform in platform_list:
 	if (env['colored']=='yes'):
 		methods.colored(sys,env)
 		
-	if (env['etc1']=='yes'):
-		env.Append(CPPFLAGS=['-DETC1_ENABLED'])
 
 	Export('env')
 
diff --git a/drivers/etc1/SCsub b/drivers/etc1/SCsub
index 251c3ffb868a..152dc3f4d048 100644
--- a/drivers/etc1/SCsub
+++ b/drivers/etc1/SCsub
@@ -6,8 +6,7 @@ etc_sources = [
 	"etc1/rg_etc1.cpp"
 ]
 
-if (env["etc1"] != "no"):
-    env.drivers_sources+=etc_sources
+env.drivers_sources+=etc_sources
 
 #env.add_source_files(env.drivers_sources, etc_sources)
 
diff --git a/drivers/register_driver_types.cpp b/drivers/register_driver_types.cpp
index e730171fbba3..e4bb1a343a73 100644
--- a/drivers/register_driver_types.cpp
+++ b/drivers/register_driver_types.cpp
@@ -222,10 +222,7 @@ void register_driver_types() {
 #endif
 #endif
 
-#ifdef ETC1_ENABLED
 	_register_etc1_compress_func();
-#endif
-
 	initialize_chibi();
 }