diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /api/api_platform-ppc.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'api/api_platform-ppc.c')
| -rw-r--r-- | api/api_platform-ppc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/api_platform-ppc.c b/api/api_platform-ppc.c index ca9f9a5cd..611a01b5e 100644 --- a/api/api_platform-ppc.c +++ b/api/api_platform-ppc.c @@ -66,7 +66,7 @@ int platform_sys_info(struct sys_info *si) si->bar = gd->bd->bi_bar; #undef bi_bar #else - si->bar = NULL; + si->bar = 0; #endif platform_set_mr(si, gd->bd->bi_memstart, gd->bd->bi_memsize, MR_ATTR_DRAM); |