From 2489007e7d740ccbc3e0a202914e243ad5178787 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sat, 22 Sep 2012 09:48:20 +0200 Subject: merge opensource jb u5 Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2 --- .../astoria/include/linux/westbridge/cyashal.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h') diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h index b695ba1..3f46201 100644 --- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h +++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h @@ -91,13 +91,27 @@ #endif /*****************************/ +#ifdef CONFIG_MACH_C110_WESTBRIDGE_AST_PNAND_HAL + + #ifdef CY_HAL_DEFINED + #error only one HAL layer can be defined + #endif + + #define CY_HAL_DEFINED +/* moved to staging location, eventual implementation + * considered is here + * #include mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h> +*/ + #include "../../../arch/arm/plat-c110/include/mach/westbridge/westbridge-c110-pnand-hal/cyashalc110_pnand.h" + +#endif + /******/ #ifdef __CY_ASTORIA_CUSTOMER_HAL__ #ifdef CY_HAL_DEFINED #error only one HAL layer can be defined #endif -br #define CY_HAL_DEFINED #include "cyashal_customer.h" -- cgit v1.1