2 files changed, 1 insertions, 56 deletions
diff --git a/include/asm-arm/arch-mx51/keypad.h b/include/asm-arm/arch-mx51/keypad.h
deleted file mode 100644
index 1e67547..0000000
--- a/include/asm-arm/arch-mx51/keypad.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * (C) Copyright 2009-2010 Freescale Semiconductor, Inc.
- *
- * Configuration settings for the MX51-3Stack Freescale board.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef _MXC_KEYPAD_H_
-#define _MXC_KEYPAD_H_
-
-#include <config.h>
-
-#define KEY_1                   2
-#define KEY_2                   3
-#define KEY_3                   4
-#define KEY_F1                  59
-#define KEY_UP                  103
-#define KEY_F2                  60
-
-#define KEY_4                   5
-#define KEY_5                   6
-#define KEY_6                   7
-#define KEY_LEFT                105
-#define KEY_SELECT              0x161
-#define KEY_RIGHT               106
-
-#define KEY_7                   8
-#define KEY_8                   9
-#define KEY_9                   10
-#define KEY_F3                  61
-#define KEY_DOWN                108
-#define KEY_F4                  62
-
-#define KEY_0                   11
-#define KEY_OK                  0x160
-#define KEY_ESC                 1
-#define KEY_ENTER               28
-#define KEY_MENU                139     /* Menu (show menu) */
-#define KEY_BACK                158     /* AC Back */
-
-#endif
diff --git a/include/asm-arm/arch-mx51/mx51.h b/include/asm-arm/arch-mx51/mx51.h
index 816e792..d06abac 100644
--- a/include/asm-arm/arch-mx51/mx51.h
+++ b/include/asm-arm/arch-mx51/mx51.h
@@ -445,7 +445,7 @@ enum boot_device {
 	NAND_BOOT = 0,
 	SPI_NOR_BOOT,
 	MMC_BOOT,
-	END_BOOT,
+	BOOT_DEV_NUM,
 };
 
 enum mxc_clock {