diff options
| author | Lee Jones <lee.jones@canonical.com> | 2010-07-16 11:20:43 +0100 |
|---|---|---|
| committer | Sebastien Jan <s-jan@ti.com> | 2010-07-28 14:43:30 +0200 |
| commit | 3f3e0737f5b4fc5dcece42c5a7846c99213c777a (patch) | |
| tree | b4c5fa67935b61d351216276dd3337875f3aaf32 | |
| parent | b8a60eece244ca5dcef8bf893150bb6a9bcf09c6 (diff) | |
Stop ARM boards crashing when CUPS is loadedintegrated-in-maverick
From b9462eba2e0d9ec687a8e6bf8046b24c1cecaf5f Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@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@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
| -rw-r--r-- | debian.ti-omap4/config/config.common.ubuntu | 30 | ||||
| -rw-r--r-- | drivers/parport/Kconfig | 2 |
2 files changed, 1 insertions, 31 deletions
diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu index 5fe7c038ca42..d29afc6bf357 100644 --- a/debian.ti-omap4/config/config.common.ubuntu +++ b/debian.ti-omap4/config/config.common.ubuntu @@ -1230,9 +1230,6 @@ CONFIG_KINGSUN_DONGLE=m CONFIG_KPROBES=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KRETPROBES=y -CONFIG_KS0108=m -CONFIG_KS0108_DELAY=2 -CONFIG_KS0108_PORT=0x378 CONFIG_KS8842=m CONFIG_KS8851=y CONFIG_KS8851_MLL=m @@ -1848,36 +1845,11 @@ CONFIG_PANEL_TAAL=y # CONFIG_PANEL_TOPPOLY_TDO35S is not set # CONFIG_PANEL_TPO_TD043MTEA1 is not set CONFIG_PANTHERLORD_FF=y -CONFIG_PARIDE=m -CONFIG_PARIDE_ATEN=m -CONFIG_PARIDE_BPCK=m -CONFIG_PARIDE_BPCK6=m -CONFIG_PARIDE_COMM=m -CONFIG_PARIDE_DSTR=m -CONFIG_PARIDE_EPAT=m -# CONFIG_PARIDE_EPATC8 is not set -CONFIG_PARIDE_EPIA=m -CONFIG_PARIDE_FIT2=m -CONFIG_PARIDE_FIT3=m -CONFIG_PARIDE_FRIQ=m -CONFIG_PARIDE_FRPW=m -CONFIG_PARIDE_KBIC=m -CONFIG_PARIDE_KTTI=m -CONFIG_PARIDE_ON20=m -CONFIG_PARIDE_ON26=m -CONFIG_PARIDE_PCD=m -CONFIG_PARIDE_PD=m -CONFIG_PARIDE_PF=m -CONFIG_PARIDE_PG=m -CONFIG_PARIDE_PT=m CONFIG_PARPORT=m CONFIG_PARPORT_1284=y CONFIG_PARPORT_AX88796=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_NOT_PC=y -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_PC_FIFO=y -# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARTITION_ADVANCED=y # CONFIG_PATA_PLATFORM is not set # CONFIG_PCCARD is not set @@ -2098,7 +2070,6 @@ CONFIG_SCSI=y CONFIG_SCSI_DMA=y # CONFIG_SCSI_ENCLOSURE is not set # CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_IMM is not set # CONFIG_SCSI_ISCSITARGET is not set # CONFIG_SCSI_ISCSI_ATTRS is not set # CONFIG_SCSI_LOGGING is not set @@ -2107,7 +2078,6 @@ CONFIG_SCSI_MOD=y # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_NETLINK is not set # CONFIG_SCSI_OSD_INITIATOR is not set -# CONFIG_SCSI_PPA is not set CONFIG_SCSI_PROC_FS=y # CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SCAN_ASYNC is not set diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index 855f389eea40..9728c0b36a0d 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 |