diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index c3558f93d42..fff141330a6 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -43,7 +43,7 @@  #include <asm/mach/flash.h>  #include <video/omapdss.h> -#include <video/omap-panel-tfp410.h> +#include <video/omap-panel-data.h>  #include <linux/platform_data/mtd-nand-omap2.h>  #include "common.h" @@ -479,7 +479,7 @@ static int __init beagle_opp_init(void)  	/* Initialize the omap3 opp table if not already created. */  	r = omap3_opp_init(); -	if (IS_ERR_VALUE(r) && (r != -EEXIST)) { +	if (r < 0 && (r != -EEXIST)) {  		pr_err("%s: opp default init failed\n", __func__);  		return r;  	}  |