diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-05-10 15:20:50 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-05-10 15:20:50 +0900 |
| commit | 9d62f20d0861ef87460d073dc189c851715b46ae (patch) | |
| tree | 43a05c86e947f01079879735ddf93218870df50b /board/mbx8xx/vpd.c | |
| parent | 6596753387c3310b86f75bebe464684d70651052 (diff) | |
| parent | e0531f975ce124f4ebdd9c7b7b107673c5628f68 (diff) | |
| download | u-boot-imx-9d62f20d0861ef87460d073dc189c851715b46ae.zip u-boot-imx-9d62f20d0861ef87460d073dc189c851715b46ae.tar.gz u-boot-imx-9d62f20d0861ef87460d073dc189c851715b46ae.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
arch/arm/include/asm/mach-types.h
common/serial.c
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'board/mbx8xx/vpd.c')
| -rw-r--r-- | board/mbx8xx/vpd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/mbx8xx/vpd.c b/board/mbx8xx/vpd.c index 3bc251d..1c99fd6 100644 --- a/board/mbx8xx/vpd.c +++ b/board/mbx8xx/vpd.c @@ -3,7 +3,7 @@ * Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Marius Groeger <mgroeger@sysgo.de> * - * Code in faintly related to linux/arch/ppc/8xx_io: + * Code in faintly related to linux/arch/powerpc/8xx_io: * MPC8xx CPM I2C interface. Copyright (c) 1999 Dan Malek (dmalek@jlc.net). * * This file implements functions to read the MBX's Vital Product Data |