Re: 2.6.2-rc2-mm1

[Olaf Hering]

 On Tue, Jan 27, Andrew Morton wrote:

> 
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.2-rc2/2.6.2-rc2-mm1/
> 
> 
> - From now on, -mm kernels will contain the latest contents of:
> 
> 	Linus's tree:		linus.patch
> 	The ACPI tree:		acpi.patch
> 	Vojtech's tree:		input.patch
> 	Jeff's tree:		netdev.patch
> 	The ALSA tree:		alsa.patch
> 
>   If anyone has any more external trees which need similar treatment,
>   please let me know.

The bigendian trees.


Here is a patch to fix compilation on ppc32.
pm_prepare_console returns int and linux/suspend.h is already included.
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
diff -p -purN linux-2.6.2-rc2-mm1.orig/drivers/macintosh/via-pmu.c linux-2.6.2-rc2-mm1/drivers/macintosh/via-pmu.c
--- linux-2.6.2-rc2-mm1.orig/drivers/macintosh/via-pmu.c	2004-01-28 19:30:54.000000000 +0000
+++ linux-2.6.2-rc2-mm1/drivers/macintosh/via-pmu.c	2004-01-28 20:00:00.000000000 +0000
@@ -2339,8 +2339,6 @@ restore_via_state(void)
 }
 
 extern long sys_sync(void);
-extern void pm_prepare_console(void);
-extern void pm_restore_console(void);
 
 static int __pmac
 pmac_suspend_devices(void)

-- 
USB is for mice, FireWire is for men!

sUse lINUX ag, nÃRNBERG
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/