From 38bf42bc3ab26b0aff8452f8a7c6813d9faa921f Mon Sep 17 00:00:00 2001
From: codeworkx <daniel.hillenbrand@codeworkx.de>
Date: Thu, 28 Jul 2011 06:04:06 -0700
Subject: fix conflict

Change-Id: I0c5780f462900d0abc2b8dc045eab135f9ce6815
---
 Android.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 9f8167c..2c427a3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,3 @@
-ifeq ($(filter-out aries,$(TARGET_BOOTLOADER_BOARD_NAME)),)
-ifeq ($(filter-out s5pv210,$(TARGET_BOARD_PLATFORM)),)
+ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),aries)
     include $(all-subdir-makefiles)
 endif
-endif
-- 
cgit v1.1