Re: 2.6.2-rc2-mm1

From: Adrian Bunk (bunk_at_fs.tum.de)
Date: 01/29/04

  • Next message: Benjamin Herrenschmidt: "Re: pmdisk working on ppc (WAS: Help port swsusp to ppc)" 
    Date:	Thu, 29 Jan 2004 01:34:12 +0100
To: Olaf Hering <olh@suse.de>, B.Zolnierkiewicz@elka.pw.edu.pl

    On Wed, Jan 28, 2004 at 09:04:08PM +0100, Olaf Hering wrote:
    >
    > Here is a patch to fix compilation on ppc32.
    >...
    > The ide object files can be found in a subdirectory.
    >
    >
    > diff -p -purN linux-2.6.2-rc2-mm1.orig/drivers/ide/Makefile linux-2.6.2-rc2-mm1/drivers/ide/Makefile
    > --- linux-2.6.2-rc2-mm1.orig/drivers/ide/Makefile 2004-01-28 19:30:54.000000000 +0000
    > +++ linux-2.6.2-rc2-mm1/drivers/ide/Makefile 2004-01-28 19:55:41.000000000 +0000
    > @@ -34,9 +34,9 @@ ide-core-$(CONFIG_BLK_DEV_MAC_IDE) += ma
    > ide-core-$(CONFIG_BLK_DEV_Q40IDE) += q40ide.o
    >
    > # built-in only drivers from ppc/
    > -ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += mpc8xx.o
    > -ide-core-$(CONFIG_BLK_DEV_IDE_PMAC) += pmac.o
    > -ide-core-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o
    > +ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += ppc/mpc8xx.o
    > +ide-core-$(CONFIG_BLK_DEV_IDE_PMAC) += ppc/pmac.o
    > +ide-core-$(CONFIG_BLK_DEV_IDE_SWARM) += ppc/swarm.o
    >
    > obj-$(CONFIG_BLK_DEV_IDE) += ide-core.o
    > obj-$(CONFIG_IDE_GENERIC) += ide-generic.o
    >...

    This was fixed in ide-legacy-build-fix.patch up to 2.6.2-rc1-mm2, which
    was dropped as "merged" in 2.6.2-rc1-mm3.

    The same is needed for legacy/, and a complete patch for
    drivers/ide/Makefile is below.

    cu
    Adrian

    --- linux-2.6.2-rc2-mm1/drivers/ide/Makefile.old 2004-01-29 01:30:27.000000000 +0100
    +++ linux-2.6.2-rc2-mm1/drivers/ide/Makefile 2004-01-29 01:31:09.000000000 +0100
    @@ -26,17 +26,17 @@
     ide-core-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o
     
     # built-in only drivers from legacy/
    -ide-core-$(CONFIG_BLK_DEV_IDE_PC9800) += pc9800.o
    -ide-core-$(CONFIG_BLK_DEV_BUDDHA) += buddha.o
    -ide-core-$(CONFIG_BLK_DEV_FALCON_IDE) += falconide.o
    -ide-core-$(CONFIG_BLK_DEV_GAYLE) += gayle.o
    -ide-core-$(CONFIG_BLK_DEV_MAC_IDE) += macide.o
    -ide-core-$(CONFIG_BLK_DEV_Q40IDE) += q40ide.o
    +ide-core-$(CONFIG_BLK_DEV_IDE_PC9800) += legacy/pc9800.o
    +ide-core-$(CONFIG_BLK_DEV_BUDDHA) += legacy/buddha.o
    +ide-core-$(CONFIG_BLK_DEV_FALCON_IDE) += legacy/falconide.o
    +ide-core-$(CONFIG_BLK_DEV_GAYLE) += legacy/gayle.o
    +ide-core-$(CONFIG_BLK_DEV_MAC_IDE) += legacy/macide.o
    +ide-core-$(CONFIG_BLK_DEV_Q40IDE) += legacy/q40ide.o
     
     # built-in only drivers from ppc/
    -ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += mpc8xx.o
    -ide-core-$(CONFIG_BLK_DEV_IDE_PMAC) += pmac.o
    -ide-core-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o
    +ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += ppc/mpc8xx.o
    +ide-core-$(CONFIG_BLK_DEV_IDE_PMAC) += ppc/pmac.o
    +ide-core-$(CONFIG_BLK_DEV_IDE_SWARM) += ppc/swarm.o
     
     obj-$(CONFIG_BLK_DEV_IDE) += ide-core.o
     obj-$(CONFIG_IDE_GENERIC) += ide-generic.o
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  • Next message: Benjamin Herrenschmidt: "Re: pmdisk working on ppc (WAS: Help port swsusp to ppc)"

    Relevant Pages

    • [05/11] Fix i2c messsage flags in video drivers
      ... The drivers improperly copy the i2c client ... flags as the message flags, while both sets are mostly unrelated. ... I think this patch qualifies hands down as a "critical bug fix" to be ... To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ - ...
      (Linux-Kernel)
    • Re: [PATCH 0/23] reboot-fixes
      ... >> Presumably it unfixes Pavel's patch? ... > the suspend path. ... > But those are among the few drivers that do anything in either ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: [patch] Real-Time Preemption, -RT-2.6.13-rc6-V0.7.53-11
      ... the patch should be okay. ... Perhaps most of the USB drivers don't care whether interrupts ... are enabled or not in their completion routines. ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: RT patch acceptance
      ... Look at the patch. ... You're the one spreading FUD that preempt-RT is as good as RTAI, ... even worse than local_irq_disable isn't used in drivers or not safe to ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: [2.6 patch] PCI cleanups
      ... > The patch below does some cleanups in the PCI code: ... Care to make a patch for just this? ... I've heard rumors that those drivers will be public ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)