From b986fe24b45cdcd01bbef787dfea94a911619b24 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 27 Jun 2011 11:03:04 -0700
Subject: [PATCH] Revert "Reverts: http://review.cyanogenmod.com/#change,6130"

This reverts commit a42d2b1e2466f69be6d802cd6511c076e0285ad9.
---
 Android.mk         | 2 +-
 extendedcommands.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Android.mk b/Android.mk
index 5af29dc..cebd834 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,7 +31,7 @@ LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
 RECOVERY_API_VERSION := 2
 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
 
-BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_HAS_SMALL_RECOVERY BOARD_LDPI_RECOVERY BOARD_UMS_LUNFILE TARGET_RECOVERY_PRE_COMMAND
+BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_HAS_SMALL_RECOVERY BOARD_LDPI_RECOVERY BOARD_UMS_LUNFILE
 
 $(foreach board_define,$(BOARD_RECOVERY_DEFINES), \
   $(if $($(board_define)), \
diff --git a/extendedcommands.c b/extendedcommands.c
index 6725bef..c2a0e18 100644
--- a/extendedcommands.c
+++ b/extendedcommands.c
@@ -894,10 +894,7 @@ void show_advanced_menu()
         switch (chosen_item)
         {
             case 0:
-#ifdef TARGET_RECOVERY_PRE_COMMAND
-                __system(TARGET_RECOVERY_PRE_COMMAND);
-#endif
-                __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_RESTART2, "recovery");
+                reboot_wrapper("recovery");
                 break;
             case 1:
             {