diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
| commit | 18122019972ca639ee3b581257e3a63ff7c8efeb (patch) | |
| tree | 52f7223e7c63f43322f3eee4722743e12190a19f /drivers/fpga/lattice.c | |
| parent | 90639feaa0d66a204f9d03a325ab14e2f97f6cbb (diff) | |
| parent | 785881f775252940185e10fbb2d5299c9ffa6bce (diff) | |
| download | olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.tar.xz olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.zip  | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
	drivers/video/exynos_fb.c
Diffstat (limited to 'drivers/fpga/lattice.c')
| -rw-r--r-- | drivers/fpga/lattice.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/fpga/lattice.c b/drivers/fpga/lattice.c index d8b642a6b..8c3465a7f 100644 --- a/drivers/fpga/lattice.c +++ b/drivers/fpga/lattice.c @@ -275,7 +275,7 @@ signed char ispVM(void)  static int lattice_validate(Lattice_desc *desc, const char *fn)  { -	int ret_val = FALSE; +	int ret_val = false;  	if (desc) {  		if ((desc->family > min_lattice_type) && @@ -283,7 +283,7 @@ static int lattice_validate(Lattice_desc *desc, const char *fn)  			if ((desc->iface > min_lattice_iface_type) &&  				(desc->iface < max_lattice_iface_type)) {  				if (desc->size) { -					ret_val = TRUE; +					ret_val = true;  				} else {  					printf("%s: NULL part size\n", fn);  				}  |