diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /post/cpu/mpc8xx/usb.c | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'post/cpu/mpc8xx/usb.c')
| -rw-r--r-- | post/cpu/mpc8xx/usb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/post/cpu/mpc8xx/usb.c b/post/cpu/mpc8xx/usb.c index 5877981..e3fe075 100644 --- a/post/cpu/mpc8xx/usb.c +++ b/post/cpu/mpc8xx/usb.c @@ -36,7 +36,7 @@ #include <post.h> -#if CONFIG_POST & CFG_POST_USB +#if CONFIG_POST & CONFIG_SYS_POST_USB #include <commproc.h> #include <command.h> @@ -105,7 +105,7 @@ typedef struct usb { int usb_post_test (int flags) { int res = -1; - volatile immap_t *im = (immap_t *) CFG_IMMR; + volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR; volatile cpm8xx_t *cp = &(im->im_cpm); volatile usb_param_t *pram_ptr; uint dpram; @@ -262,4 +262,4 @@ int usb_post_test (int flags) return res; } -#endif /* CONFIG_POST & CFG_POST_USB */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_USB */ |