## Automatically generated incremental diff
## From:   linux-2.4.21-bk28
## To:     linux-2.4.21-bk29
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.4.21-bk28/Makefile linux-2.4.21-bk29/Makefile
--- linux-2.4.21-bk28/Makefile	2003-08-08 02:54:07.000000000 -0700
+++ linux-2.4.21-bk29/Makefile	2003-08-08 02:54:16.000000000 -0700
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 21
-EXTRAVERSION = -bk28
+EXTRAVERSION = -bk29
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.21-bk28/drivers/pci/pci.ids linux-2.4.21-bk29/drivers/pci/pci.ids
--- linux-2.4.21-bk28/drivers/pci/pci.ids	2003-08-08 02:54:12.000000000 -0700
+++ linux-2.4.21-bk29/drivers/pci/pci.ids	2003-08-08 02:54:17.000000000 -0700
@@ -1348,6 +1348,7 @@
 		103c 1226  Keystone SP2
 		103c 1227  Powerbar SP2
 		103c 1282  Everest SP2
+	1054  PCI Local Bus Adapter
 	1064  79C970 PCnet Ethernet Controller
 	108b  Visualize FXe
 	10c1  NetServer Smart IRQ Router
@@ -1359,7 +1360,8 @@
 	121c  NetServer PCI COM Port Decoder
 	1229  zx1 System Bus Adapter
 	122a  zx1 I/O Controller
-	122e  zx1 Local Bus Adapter
+	122e  PCI-X/AGP Local Bus Adapter
+	127c  sx1000 I/O Controller
 	1290  Auxiliary Diva Serial Port
 	2910  E2910A PCIBus Exerciser
 	2925  E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer
diff -urN linux-2.4.21-bk28/include/linux/pci_ids.h linux-2.4.21-bk29/include/linux/pci_ids.h
--- linux-2.4.21-bk28/include/linux/pci_ids.h	2003-08-08 02:54:14.000000000 -0700
+++ linux-2.4.21-bk29/include/linux/pci_ids.h	2003-08-08 02:54:19.000000000 -0700
@@ -589,11 +589,13 @@
 #define PCI_DEVICE_ID_HP_DIVA1		0x1049
 #define PCI_DEVICE_ID_HP_DIVA2		0x104A
 #define PCI_DEVICE_ID_HP_SP2_0		0x104B
+#define PCI_DEVICE_ID_HP_PCI_LBA	0x1054
 #define PCI_DEVICE_ID_HP_REO_SBA	0x10f0
 #define PCI_DEVICE_ID_HP_REO_IOC	0x10f1
 #define PCI_DEVICE_ID_HP_ZX1_SBA	0x1229
 #define PCI_DEVICE_ID_HP_ZX1_IOC	0x122a
-#define PCI_DEVICE_ID_HP_ZX1_LBA	0x122e
+#define PCI_DEVICE_ID_HP_PCIX_LBA	0x122e
+#define PCI_DEVICE_ID_HP_SX1000_IOC	0x127c
 
 #define PCI_VENDOR_ID_PCTECH		0x1042
 #define PCI_DEVICE_ID_PCTECH_RZ1000	0x1000
