diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 13:48:51 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 13:48:51 +0100 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /arch/arm/plat-mxc/include/mach/board-mx31lite.h | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
| download | op-kernel-dev-f11cbd74c5ff3614f6390b4de67a6ffdc614c378.zip op-kernel-dev-f11cbd74c5ff3614f6390b4de67a6ffdc614c378.tar.gz | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/board-mx31lite.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/board-mx31lite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/board-mx31lite.h b/arch/arm/plat-mxc/include/mach/board-mx31lite.h index 0184b63..2b2da03 100644 --- a/arch/arm/plat-mxc/include/mach/board-mx31lite.h +++ b/arch/arm/plat-mxc/include/mach/board-mx31lite.h @@ -25,7 +25,7 @@ #ifndef __ASSEMBLY__ -enum mx31lilly_boards { +enum mx31lite_boards { MX31LITE_NOBOARD = 0, MX31LITE_DB = 1, }; |
