diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom-debugboard.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom-debugboard.c | 12 | 
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index f64f4417306..afb2278a29f 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c @@ -18,10 +18,13 @@  #include <linux/regulator/machine.h>  #include <plat/gpmc.h> -#include <plat/gpmc-smsc911x.h> +#include "gpmc-smsc911x.h"  #include <mach/board-zoom.h> +#include "soc.h" +#include "common.h" +  #define ZOOM_SMSC911X_CS	7  #define ZOOM_SMSC911X_GPIO	158  #define ZOOM_QUADUART_CS	3 @@ -81,8 +84,7 @@ static inline void __init zoom_init_quaduart(void)  	quart_cs = ZOOM_QUADUART_CS;  	if (gpmc_cs_request(quart_cs, SZ_1M, &cs_mem_base) < 0) { -		printk(KERN_ERR "Failed to request GPMC mem" -				"for Quad UART(TL16CP754C)\n"); +		pr_err("Failed to request GPMC mem for Quad UART(TL16CP754C)\n");  		return;  	} @@ -104,8 +106,8 @@ static inline int omap_zoom_debugboard_detect(void)  	if (gpio_request_one(debug_board_detect, GPIOF_IN,  			     "Zoom debug board detect") < 0) { -		printk(KERN_ERR "Failed to request GPIO%d for Zoom debug" -		"board detect\n", debug_board_detect); +		pr_err("Failed to request GPIO%d for Zoom debug board detect\n", +		       debug_board_detect);  		return 0;  	}  |