diff options
| author | Javier Viguera <javier.viguera@digi.com> | 2011-08-04 13:26:13 +0200 |
|---|---|---|
| committer | Javier Viguera <javier.viguera@digi.com> | 2011-08-04 13:27:48 +0200 |
| commit | d90538ff3973cfed0fd88b6201ac4b8d235c435f (patch) | |
| tree | 9eac4dca4d9ee8ef21fc8af28efad60111082ec4 /include | |
| parent | 540a737e689d50f1d228b266ff10e78e25e2ef4c (diff) | |
kernel headers: fix FSL kernel headers exported to user-space
Minimal change that allows to build the toolchain until FSL fixes
properly its kernel headers.
This reverts previous commit.
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/Kbuild | 2 | ||||
| -rw-r--r-- | include/linux/fsl_devices.h | 2 | ||||
| -rw-r--r-- | include/linux/pmic_external.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 65463dd75c59..196c789502be 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -388,7 +388,7 @@ unifdef-y += xattr.h unifdef-y += xfrm.h ## i.MX specific files -#unifdef-y += fsl_devices.h +unifdef-y += fsl_devices.h unifdef-y += isl29023.h unifdef-y += imx_adc.h unifdef-y += ipu.h diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index a26420aa6202..d6624199a951 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -18,7 +18,9 @@ #define _FSL_DEVICE_H_ #include <linux/types.h> +#ifdef __KERNEL__ #include <linux/cdev.h> +#endif /*__KERNEL__*/ /* * Some conventions on how we handle peripherals on Freescale chips diff --git a/include/linux/pmic_external.h b/include/linux/pmic_external.h index dd6c7c11b5a3..d704a5315c99 100644 --- a/include/linux/pmic_external.h +++ b/include/linux/pmic_external.h @@ -41,7 +41,9 @@ #include <linux/ioctl.h> #include <linux/pmic_status.h> +#ifdef __KERNEL__ #include <linux/spi/spi.h> +#endif /*__KERNEL__*/ /*! * This is the enumeration of versions of PMIC |