diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-08-31 08:23:58 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-08-31 08:23:58 +0200 |
| commit | 83027ea1202394a80ca58ed8da84e207d855521e (patch) | |
| tree | e785ac503165d57d3a5cfb88f20eff034d12199f /linux/arch/arm/mach-pxa/pcm990-baseboard.c | |
| parent | f1a52a2e70204db19b6c81bb59de2c759cefaaa6 (diff) | |
| parent | 7804585be37d9aa982df2d476a795cbe459dae4a (diff) | |
| download | mediapointer-dvb-s2-83027ea1202394a80ca58ed8da84e207d855521e.tar.gz mediapointer-dvb-s2-83027ea1202394a80ca58ed8da84e207d855521e.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/arch/arm/mach-pxa/pcm990-baseboard.c')
| -rw-r--r-- | linux/arch/arm/mach-pxa/pcm990-baseboard.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/linux/arch/arm/mach-pxa/pcm990-baseboard.c b/linux/arch/arm/mach-pxa/pcm990-baseboard.c index 30023b00e..973370295 100644 --- a/linux/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/linux/arch/arm/mach-pxa/pcm990-baseboard.c @@ -22,16 +22,24 @@ #include <linux/irq.h> #include <linux/platform_device.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) #include <linux/ide.h> +#endif #include <linux/i2c.h> #include <linux/pwm_backlight.h> #include <media/soc_camera.h> #include <asm/gpio.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) #include <asm/arch/i2c.h> #include <asm/arch/camera.h> +#else +#include <mach/i2c.h> +#include <mach/camera.h> +#endif #include <asm/mach/map.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) #include <asm/arch/pxa-regs.h> #include <asm/arch/audio.h> #include <asm/arch/mmc.h> @@ -39,6 +47,15 @@ #include <asm/arch/pcm990_baseboard.h> #include <asm/arch/pxafb.h> #include <asm/arch/mfp-pxa27x.h> +#else +#include <mach/pxa-regs.h> +#include <mach/audio.h> +#include <mach/mmc.h> +#include <mach/ohci.h> +#include <mach/pcm990_baseboard.h> +#include <mach/pxafb.h> +#include <mach/mfp-pxa27x.h> +#endif #include "devices.h" #include "generic.h" |