[APPLIED] [Maverick][PATCH] Stop ARM boards crashing when CUPS is loaded

[Leann Ogasawara]

Applied to Maverick linux master.  I'll let Tim apply this for the
ti-omap4 branch.

Thanks,
Leann

On Fri, 2010-07-16 at 11:20 +0100, Lee Jones wrote:
> From b9462eba2e0d9ec687a8e6bf8046b24c1cecaf5f Mon Sep 17 00:00:00 2001
> From: Lee Jones <lee.jones at canonical.com>
> Date: Fri, 16 Jul 2010 09:37:31 +0100
> Subject: [PATCH] UBUNTU: Stop ARM boards crashing when CUPS is loaded
> 
> BugLink: http://bugs.launchpad.net/bugs/601226
> 
> When CUPS loads, it tries to load several drivers it may need. When
> one of these drivers, specifically parport_pc is loaded, it attempts
> to write to address space normally reserved for ISA transactions.
> On OMAP based systems, this causes a segmentation fault.
> 
> Signed-off-by: Lee Jones <lee.jones at canonical.com>
> ---
>  drivers/parport/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
> index 855f389..9728c0b 100644
> --- a/drivers/parport/Kconfig
> +++ b/drivers/parport/Kconfig
> @@ -36,7 +36,7 @@ if PARPORT
>  config PARPORT_PC
>  	tristate "PC-style hardware"
>  	depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && \
> -		(!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN
> +		(!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && !ARCH_OMAP
>  	---help---
>  	  You should say Y here if you have a PC-style parallel port. All
>  	  IBM PC compatible computers and some Alphas have PC-style
> -- 
> 1.7.0.4
>