diff options
author | Wolfgang Denk <wd@denx.de> | 2011-04-05 12:24:20 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-04-05 12:24:20 +0200 |
commit | 4db2fa7f9446d0f2fe8db3d62184b1212fe22707 (patch) | |
tree | bc62cbfc14296551caebda626db7a90fef9ae844 /board/freescale/mpc8572ds/mpc8572ds.c | |
parent | 75df0d594990875419121c6f8687472ac9f4ae7a (diff) | |
parent | 7d3053fbf16caad4745f42f7ae3e38e9d3e964b5 (diff) | |
download | blackbird-obmc-uboot-4db2fa7f9446d0f2fe8db3d62184b1212fe22707.tar.gz blackbird-obmc-uboot-4db2fa7f9446d0f2fe8db3d62184b1212fe22707.zip |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Conflicts:
drivers/usb/host/ehci-pci.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/freescale/mpc8572ds/mpc8572ds.c')
-rw-r--r-- | board/freescale/mpc8572ds/mpc8572ds.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index 4b2ef4e5e6..f444805a4d 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -1,5 +1,5 @@ /* - * Copyright 2007-2010 Freescale Semiconductor, Inc. + * Copyright 2007-2011 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -259,12 +259,3 @@ void ft_board_setup(void *blob, bd_t *bd) #endif } #endif - -#ifdef CONFIG_MP -extern void cpu_mp_lmb_reserve(struct lmb *lmb); - -void board_lmb_reserve(struct lmb *lmb) -{ - cpu_mp_lmb_reserve(lmb); -} -#endif |