diff --git a/arch/arm/mach-msm/board-htcleo.c b/arch/arm/mach-msm/board-htcleo.c
index 5a4cb7a2..b6522715 100644
--- a/arch/arm/mach-msm/board-htcleo.c
+++ b/arch/arm/mach-msm/board-htcleo.c
@@ -63,6 +63,25 @@
 extern int __init htcleo_init_mmc(unsigned debug_uart);
 extern void __init htcleo_audio_init(void);
 extern unsigned char *get_bt_bd_ram(void);
+static unsigned int nand_boot = 1;
+
+
+///////////////////////////////////////////////////////////////////////
+// Nand boot Option
+///////////////////////////////////////////////////////////////////////
+int htcleo_is_nand_boot(void)
+{
+	return nand_boot;	
+}
+
+static int __init board_nandboot_setup(char *bootconfig)
+{
+	if (!strncmp(bootconfig, "0", 1))
+		nand_boot=0;
+	return 1;
+}
+__setup("nand_boot=", board_nandboot_setup);
+
 
 ///////////////////////////////////////////////////////////////////////
 // SPI
diff --git a/arch/arm/mach-msm/board-htcleo.h b/arch/arm/mach-msm/board-htcleo.h
index 7b35d8fe..38993985 100644
--- a/arch/arm/mach-msm/board-htcleo.h
+++ b/arch/arm/mach-msm/board-htcleo.h
@@ -168,5 +168,6 @@
 
 int htcleo_pm_set_vreg(int enable, unsigned id);
 int __init htcleo_init_panel(void);
+int htcleo_is_nand_boot(void);
 
 #endif /* __ARCH_ARM_MACH_MSM_BOARD_HTCLEO_H */