rpms/kernel/devel linux-2.6-compile-fixes.patch,1.13,1.14

[fedora-cvs-commits redhat com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7584

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
build fix


linux-2.6-compile-fixes.patch:
 linux-10000/arch/i386/Makefile              |    4 -
 linux-10000/arch/i386/kernel/Makefile       |    6 -
 linux-10000/arch/i386/kernel/nmi.c          |    2 
 linux-10000/arch/ppc64/Makefile             |    2 
 linux-10000/arch/ppc64/boot/Makefile        |    3 
 linux-10000/arch/x86_64/ia32/sys_ia32.c     |    1 
 linux-10000/arch/x86_64/mm/init.c           |    2 
 linux-10000/drivers/acpi/ec.c               |    2 
 linux-10000/drivers/net/acenic.c            |    2 
 linux-10000/drivers/pci/search.c            |    2 
 linux-10000/drivers/usb/storage/scsiglue.c  |    2 
 linux-10000/fs/open.c                       |    1 
 linux-10000/fs/proc/generic.c               |    2 
 linux-10000/include/linux/config.h          |    4 -
 linux-10000/include/linux/delay.h           |   17 ++---
 linux-10000/include/linux/gfp.h             |    2 
 linux-10000/include/linux/namei.h           |    2 
 linux-10000/init/Kconfig                    |    2 
 linux-10000/kernel/pid.c                    |    2 
 linux-10000/scripts/reference_discarded.pl  |    3 
 linux-10000/scripts/reference_init.pl       |    1 
 linux-10000/sound/core/oss/pcm_oss.c        |    7 ++
 linux-10001/arch/ppc/Makefile               |    1 
 linux-10001/arch/ppc/kernel/head.S          |    2 
 linux-10001/arch/ppc/kernel/misc.S          |    2 
 linux-10001/arch/ppc/mm/hashtable.S         |    4 -
 linux-10001/arch/ppc/platforms/pmac_sleep.S |    2 
 linux-10001/arch/ppc64/Makefile             |    2 
 linux-10001/arch/ppc64/boot/main.c          |    1 
 linux-10001/crypto/Makefile                 |    2 
 linux-10001/drivers/md/Makefile             |    2 
 linux-10001/include/asm-ppc/ppc_asm.h       |    2 
 linux-10001/include/linux/config.h          |    2 
 linux-10001/scripts/kconfig/Makefile        |    2 
 linux-10001/scripts/reference_discarded.pl  |    1 
 linux-10001/sound/core/oss/Makefile         |    1 
 linux-2.6.11/Makefile                       |    2 
 linux-2.6.11/drivers/char/agp/hp-agp.c      |    3 
 linux-2.6.11/drivers/scsi/ide-scsi.c        |    7 +-
 linux-2.6.11/drivers/usb/storage/usb.c      |    2 
 linux-2.6.12/drivers/i2c/busses/i2c-mpc.c   |   94 ----------------------------
 linux-2.6.12/drivers/net/sk98lin/skge.c     |    2 
 linux-2.6.12/drivers/net/skge.c             |    2 
 43 files changed, 69 insertions(+), 140 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-compile-fixes.patch	1 Aug 2005 20:12:11 -0000	1.13
+++ linux-2.6-compile-fixes.patch	1 Aug 2005 20:35:08 -0000	1.14
@@ -660,3 +660,16 @@
  MODULE_AUTHOR("Adrian Cox <adrian humboldt co uk>");
  MODULE_DESCRIPTION
      ("I2C-Bus adapter for MPC107 bridge and MPC824x/85xx/52xx processors");
+--- linux-2.6.12/drivers/net/sk98lin/skge.c~	2005-08-01 16:32:42.000000000 -0400
++++ linux-2.6.12/drivers/net/sk98lin/skge.c	2005-08-01 16:33:10.000000000 -0400
+@@ -5233,8 +5233,10 @@ static struct pci_driver skge_driver = {
+ 	.id_table	= skge_pci_tbl,
+ 	.probe		= skge_probe_one,
+ 	.remove		= __devexit_p(skge_remove_one),
++#ifdef CONFIG_PM
+ 	.suspend	= skge_suspend,
+ 	.resume		= skge_resume,
++#endif
+ };
+ 
+ static int __init skge_init(void)