diff options
Diffstat (limited to 'arch/arm/mach-imx/mach-cpuimx35.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-cpuimx35.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c index 6450303f1a7..1634e54ffed 100644 --- a/arch/arm/mach-imx/mach-cpuimx35.c +++ b/arch/arm/mach-imx/mach-cpuimx35.c @@ -141,18 +141,18 @@ static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {  	.workaround	= FLS_USB2_WORKAROUND_ENGCM09152,  }; -static int otg_mode_host; +static bool otg_mode_host __initdata;  static int __init eukrea_cpuimx35_otg_mode(char *options)  {  	if (!strcmp(options, "host")) -		otg_mode_host = 1; +		otg_mode_host = true;  	else if (!strcmp(options, "device")) -		otg_mode_host = 0; +		otg_mode_host = false;  	else  		pr_info("otg_mode neither \"host\" nor \"device\". "  			"Defaulting to device\n"); -	return 0; +	return 1;  }  __setup("otg_mode=", eukrea_cpuimx35_otg_mode); @@ -167,7 +167,7 @@ static void __init eukrea_cpuimx35_init(void)  			ARRAY_SIZE(eukrea_cpuimx35_pads));  	imx35_add_fec(NULL); -	imx35_add_imx2_wdt(NULL); +	imx35_add_imx2_wdt();  	imx35_add_imx_uart0(&uart_pdata);  	imx35_add_mxc_nand(&eukrea_cpuimx35_nand_board_info);  |