[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel/devel linux-2.6-compile-fixes.patch,1.77,1.78



Author: davej

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

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


linux-2.6-compile-fixes.patch:
 drivers/net/myri10ge/myri10ge.c |    2 +-
 drivers/video/Kconfig           |    4 ++--
 include/linux/pci_regs.h        |    1 +
 kernel/power/main.c             |    2 +-
 4 files changed, 5 insertions(+), 4 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.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- linux-2.6-compile-fixes.patch	22 Jun 2006 19:18:33 -0000	1.77
+++ linux-2.6-compile-fixes.patch	22 Jun 2006 19:24:06 -0000	1.78
@@ -1,4 +1,3 @@
-current.diff
 
 kernel/power/main.c: In function 'suspend_prepare':
 kernel/power/main.c:89: error: implicit declaration of function 'suspend_console'
@@ -44,16 +43,6 @@
  #define  PCI_CAP_ID_EXP 	0x10	/* PCI Express */
  #define  PCI_CAP_ID_MSIX	0x11	/* MSI-X */
 
---- linux-2.6.17.noarch/include/linux/pci_regs.h~	2006-06-22 14:54:33.000000000 -0400
-+++ linux-2.6.17.noarch/include/linux/pci_regs.h	2006-06-22 14:54:59.000000000 -0400
-@@ -197,6 +197,7 @@
- #define  PCI_CAP_ID_CHSWP	0x06	/* CompactPCI HotSwap */
- #define  PCI_CAP_ID_PCIX	0x07	/* PCI-X */
- #define  PCI_CAP_ID_HT_IRQCONF	0x08	/* HyperTransport IRQ Configuration */
-+#define  PCI_CAP_ID_VNDR	0x09
- #define  PCI_CAP_ID_SHPC 	0x0C	/* PCI Standard Hot-Plug Controller */
- #define  PCI_CAP_ID_EXP 	0x10	/* PCI Express */
- #define  PCI_CAP_ID_MSIX	0x11	/* MSI-X */
 --- linux-2.6.17.noarch/drivers/net/myri10ge/myri10ge.c~	2006-06-22 15:16:35.000000000 -0400
 +++ linux-2.6.17.noarch/drivers/net/myri10ge/myri10ge.c	2006-06-22 15:18:18.000000000 -0400
 @@ -2120,7 +2120,7 @@ abort_linearize:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]