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 6450303f1a7a..1634e54ffed5 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 = { | |||
141 | .workaround = FLS_USB2_WORKAROUND_ENGCM09152, | 141 | .workaround = FLS_USB2_WORKAROUND_ENGCM09152, |
142 | }; | 142 | }; |
143 | 143 | ||
144 | static int otg_mode_host; | 144 | static bool otg_mode_host __initdata; |
145 | 145 | ||
146 | static int __init eukrea_cpuimx35_otg_mode(char *options) | 146 | static int __init eukrea_cpuimx35_otg_mode(char *options) |
147 | { | 147 | { |
148 | if (!strcmp(options, "host")) | 148 | if (!strcmp(options, "host")) |
149 | otg_mode_host = 1; | 149 | otg_mode_host = true; |
150 | else if (!strcmp(options, "device")) | 150 | else if (!strcmp(options, "device")) |
151 | otg_mode_host = 0; | 151 | otg_mode_host = false; |
152 | else | 152 | else |
153 | pr_info("otg_mode neither \"host\" nor \"device\". " | 153 | pr_info("otg_mode neither \"host\" nor \"device\". " |
154 | "Defaulting to device\n"); | 154 | "Defaulting to device\n"); |
155 | return 0; | 155 | return 1; |
156 | } | 156 | } |
157 | __setup("otg_mode=", eukrea_cpuimx35_otg_mode); | 157 | __setup("otg_mode=", eukrea_cpuimx35_otg_mode); |
158 | 158 | ||
@@ -167,7 +167,7 @@ static void __init eukrea_cpuimx35_init(void) | |||
167 | ARRAY_SIZE(eukrea_cpuimx35_pads)); | 167 | ARRAY_SIZE(eukrea_cpuimx35_pads)); |
168 | 168 | ||
169 | imx35_add_fec(NULL); | 169 | imx35_add_fec(NULL); |
170 | imx35_add_imx2_wdt(NULL); | 170 | imx35_add_imx2_wdt(); |
171 | 171 | ||
172 | imx35_add_imx_uart0(&uart_pdata); | 172 | imx35_add_imx_uart0(&uart_pdata); |
173 | imx35_add_mxc_nand(&eukrea_cpuimx35_nand_board_info); | 173 | imx35_add_mxc_nand(&eukrea_cpuimx35_nand_board_info); |