| Message ID | 1281686732-32121-1-git-send-email-themuso@ubuntu.com |
|---|---|
| State | Accepted |
| Delegated to: | Leann Ogasawara |
| Headers | show |
Is this for Lucid or Maverick? Stefan
On Fri, 2010-08-13 at 13:58 +0200, Stefan Bader wrote:
> Is this for Lucid or Maverick?
I know this is true for Maverick. Not sure if Luke also wants this
considered for Lucid SRU, but I'm guessing no.
Leann
Applied to Maverick linux master. Thanks, Leann On Fri, 2010-08-13 at 18:05 +1000, Luke Yelavich wrote: > The new firewire stack was enabled for i386/x86_64, but nto for powerpc. > > Signed-off-by: Luke Yelavich <themuso@ubuntu.com> > --- > 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 > -- > 1.7.1 > >
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
The new firewire stack was enabled for i386/x86_64, but nto for powerpc. Signed-off-by: Luke Yelavich <themuso@ubuntu.com> --- 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(-)