diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-24 01:33:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-24 01:33:08 -0300 |
| commit | 005392231f73c7f7781c04eebf5869c0174f503e (patch) | |
| tree | a261d186361d85d130fe033cc63d575421800727 /linux/arch/arm/mach-pxa | |
| parent | 59964b28e0205cdf0a4465194f40867b7c7f5aa6 (diff) | |
| parent | 2da45c822154d03cd7db86ac11b52385f1fac384 (diff) | |
| download | mediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.gz mediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.bz2 | |
merge: http://jusst.de/hg/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/arch/arm/mach-pxa')
| -rw-r--r-- | linux/arch/arm/mach-pxa/devices.c | 2 | ||||
| -rw-r--r-- | linux/arch/arm/mach-pxa/pcm990-baseboard.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/linux/arch/arm/mach-pxa/devices.c b/linux/arch/arm/mach-pxa/devices.c index 5b7747052..5ec10735b 100644 --- a/linux/arch/arm/mach-pxa/devices.c +++ b/linux/arch/arm/mach-pxa/devices.c @@ -32,7 +32,9 @@ #include <mach/audio.h> #include <mach/pxa3xx_nand.h> #else +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) #include <mach/pxa-regs.h> +#endif #include <mach/udc.h> #include <mach/pxafb.h> #include <mach/mmc.h> diff --git a/linux/arch/arm/mach-pxa/pcm990-baseboard.c b/linux/arch/arm/mach-pxa/pcm990-baseboard.c index d1df34985..7a95c80ab 100644 --- a/linux/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/linux/arch/arm/mach-pxa/pcm990-baseboard.c @@ -48,14 +48,20 @@ #include <asm/arch/pxafb.h> #include <asm/arch/mfp-pxa27x.h> #else +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) #include <mach/pxa-regs.h> +#else +#include <mach/pxa27x.h> +#endif #include <mach/audio.h> #include <mach/mmc.h> #include <mach/ohci.h> #include <mach/pcm990_baseboard.h> #include <mach/pxafb.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) #include <mach/mfp-pxa27x.h> #endif +#endif #include "devices.h" #include "generic.h" |