From 6a9ef1773bf874dea493ff3861782a1e577b67dd Mon Sep 17 00:00:00 2001
From: David Turner <digit@android.com>
Date: Thu, 9 Sep 2010 22:54:36 +0200
Subject: upstream: move timer management code to qemu-timer.c

---
 cpu-defs.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'cpu-defs.h')

diff --git a/cpu-defs.h b/cpu-defs.h
index c96b9ae..7fdbe97 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -19,11 +19,9 @@
 #ifndef CPU_DEFS_H
 #define CPU_DEFS_H
 
-#if 0 /* ANDROID */
 #ifndef NEED_CPU_H
 #error cpu.h included from common code
 #endif
-#endif /* ANDROID */
 
 #include "config.h"
 #include <setjmp.h>
-- 
cgit v1.1