diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h')
| -rw-r--r-- | drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h | 16 |
1 files changed, 15 insertions, 1 deletions
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" |