[Upstream] Stop ARM boards crashing with CUPS is loaded

[Lee Jones <ljkenny@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 402 bytes --]

Please find attached a patch which rectifies the following bug.

When CUPS loads, it tries to load several drivers that it may need.
When one of these drivers, specifically parport_pc is loaded on ARM
based systems, it causes a segmentation fault as the address is not
writable on non-PC based architectures. This code prevents this
driver from being compiled on said architectures.

Kind regards,
Lee

[-- Attachment #2: 0001-UBUNTU-Upstream-Stop-ARM-boards-crashing-with-CUPS-i.patch --]
[-- Type: text/x-patch, Size: 1309 bytes --]

>From e7552c2cfbceb22af2765b7bea91e0ea830010b7 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@canonical.com>
Date: Mon, 12 Jul 2010 12:41:54 +0100
Subject: [PATCH] UBUNTU: [Upstream] Stop ARM boards crashing with CUPS is loaded

BugLink: http://bugs.launchpad.net/bugs/601226

When CUPS loads, it tries to load several drivers that it may need.
When one of these drivers, specifically parport_pc is loaded on ARM
based systems, it causes a segmentation fault as the address is not
writable on non-PC based architectures. This code prevents this
driver from being compiled on said architectures.

Signed-off-by: Lee Jones <lee.jones@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..ef1c666 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 && !ARM
 	---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