diff options
Diffstat (limited to 'arch/arm/mach-imx/mach-pca100.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-pca100.c | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index 541152e450c..d37ed25003b 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c @@ -298,18 +298,18 @@ static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {  	.phy_mode       = FSL_USB2_PHY_ULPI,  }; -static int otg_mode_host; +static bool otg_mode_host __initdata;  static int __init pca100_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=", pca100_otg_mode); @@ -408,8 +408,8 @@ static void __init pca100_init(void)  	imx27_add_imx_fb(&pca100_fb_data);  	imx27_add_fec(NULL); -	imx27_add_imx2_wdt(NULL); -	imx27_add_mxc_w1(NULL); +	imx27_add_imx2_wdt(); +	imx27_add_mxc_w1();  }  static void __init pca100_timer_init(void)  |