From patchwork Fri Aug 13 08:05:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luke Yelavich X-Patchwork-Id: 61674 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 7BF20B70D6 for ; Fri, 13 Aug 2010 18:05:50 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OjpGi-0003Np-B8; Fri, 13 Aug 2010 09:05:36 +0100 Received: from nschwmtas03p.mx.bigpond.com ([61.9.189.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OjpGf-0003Mq-T1 for kernel-team@lists.ubuntu.com; Fri, 13 Aug 2010 09:05:34 +0100 Received: from nschwotgx03p.mx.bigpond.com ([124.189.84.179]) by nschwmtas03p.mx.bigpond.com with ESMTP id <20100813080531.VKHX20574.nschwmtas03p.mx.bigpond.com@nschwotgx03p.mx.bigpond.com> for ; Fri, 13 Aug 2010 08:05:31 +0000 Received: from strigy.yelavich.home ([124.189.84.179]) by nschwotgx03p.mx.bigpond.com with ESMTP id <20100813080530.QPYI16083.nschwotgx03p.mx.bigpond.com@strigy.yelavich.home> for ; Fri, 13 Aug 2010 08:05:30 +0000 From: Luke Yelavich To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] Enable new firewire stack on powerpc Date: Fri, 13 Aug 2010 18:05:32 +1000 Message-Id: <1281686732-32121-1-git-send-email-themuso@ubuntu.com> X-Mailer: git-send-email 1.7.1 X-RPD-ScanID: Class unknown; VirusThreatLevel unknown, RefID str=0001.0A090203.4C64FCCA.0133,ss=1,fgs=0 X-SIH-MSG-ID: rB0wENL8TAD0zmZ50TCxOw4nyF2wq3gv8Z4QX81loRMGRELduMbXU7zhKrMwhNn21T1cNhKPPmQqYKz0X4/QsuM= X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com The new firewire stack was enabled for i386/x86_64, but nto for powerpc. Signed-off-by: Luke Yelavich --- debian.master/config/config.common.ports | 7 +++++-- debian.master/config/ia64/config.common.ia64 | 2 ++ debian.master/config/powerpc/config.common.powerpc | 2 ++ debian.master/config/sparc/config.common.sparc | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index bf2a407..7cbc6b5 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -794,7 +794,6 @@ CONFIG_DVB_DS3000=m CONFIG_DVB_DYNAMIC_MINORS=y # CONFIG_DVB_FE_CUSTOMISE is not set CONFIG_DVB_FIREDTV=m -# CONFIG_DVB_FIREDTV_FIREWIRE is not set CONFIG_DVB_FIREDTV_IEEE1394=y CONFIG_DVB_FIREDTV_INPUT=y CONFIG_DVB_HOPPER=m @@ -1043,7 +1042,11 @@ CONFIG_FDDI=y CONFIG_FEALNX=m CONFIG_FIB_RULES=y CONFIG_FILE_LOCKING=y -# CONFIG_FIREWIRE is not set +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_OHCI_DEBUG=y +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +CONFIG_FIREWIRE_SBP2=m CONFIG_FIRMWARE_EDID=y CONFIG_FIRMWARE_IN_KERNEL=y # CONFIG_FIRMWARE_MEMMAP is not set diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64 index aa42773..a25b5ac 100644 --- a/debian.master/config/ia64/config.common.ia64 +++ b/debian.master/config/ia64/config.common.ia64 @@ -42,6 +42,7 @@ CONFIG_DM9102=m CONFIG_DMADEVICES=y CONFIG_DRM=m CONFIG_DVB_CORE=m +# CONFIG_DVB_FIREDTV_FIREWIRE is not set CONFIG_ECONET=m CONFIG_EZX_PCAP=y CONFIG_FB_3DFX=y @@ -66,6 +67,7 @@ CONFIG_FB_SYS_IMAGEBLIT=m CONFIG_FB_TRIDENT=m # CONFIG_FB_VIA is not set CONFIG_FB_VOODOO1=y +# CONFIG_FIREWIRE is not set # CONFIG_FLATMEM_MANUAL is not set CONFIG_FORCEDETH=m CONFIG_FORCE_MAX_ZONEORDER=17 diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 67db488..1cde1cb 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -39,6 +39,7 @@ CONFIG_DM9102=m # CONFIG_DMADEVICES is not set CONFIG_DRM=m CONFIG_DVB_CORE=m +CONFIG_DVB_FIREDTV_FIREWIRE=y CONFIG_ECONET=m # CONFIG_EZX_PCAP is not set CONFIG_FB_3DFX=y @@ -59,6 +60,7 @@ CONFIG_FB_SIS=m CONFIG_FB_TRIDENT=m CONFIG_FB_VIA=m CONFIG_FB_VOODOO1=y +CONFIG_FIREWIRE=m CONFIG_FORCEDETH=m CONFIG_FUSION_MAX_SGE=128 CONFIG_GAMEPORT=m diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc index 098837e..19e0a16 100644 --- a/debian.master/config/sparc/config.common.sparc +++ b/debian.master/config/sparc/config.common.sparc @@ -43,6 +43,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_DMADEVICES=y CONFIG_DRM=y # CONFIG_DVB_CORE is not set +# CONFIG_DVB_FIREDTV_FIREWIRE is not set # CONFIG_ECONET is not set # CONFIG_EZX_PCAP is not set # CONFIG_FB_3DFX is not set @@ -67,6 +68,7 @@ CONFIG_FB_SYS_IMAGEBLIT=m # CONFIG_FB_TRIDENT is not set CONFIG_FB_VIA=m # CONFIG_FB_VOODOO1 is not set +# CONFIG_FIREWIRE is not set # CONFIG_FLATMEM_MANUAL is not set # CONFIG_FORCEDETH is not set CONFIG_FUSION_MAX_SGE=40