Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6] / include / asm-ia64 / sn / pcibus_provider_defs.h

diff --git a/include/asm-ia64/sn/pcibus_provider_defs.h b/include/asm-ia64/sn/pcibus_provider_defs.h
index f546b4ece33c2e7c0ef390ac8947a60c7255b2c4..04e27d5b38207aac050fdc31b7d49806418dd94f 100644 (file)
--- a/include/asm-ia64/sn/pcibus_provider_defs.h
+++ b/include/asm-ia64/sn/pcibus_provider_defs.h
@@ -17,8 +17,9 @@
 #define PCIIO_ASIC_TYPE_PPB    1
 #define PCIIO_ASIC_TYPE_PIC    2
 #define PCIIO_ASIC_TYPE_TIOCP  3
+#define PCIIO_ASIC_TYPE_TIOCA  4
 
-#define PCIIO_ASIC_MAX_TYPES   4
+#define PCIIO_ASIC_MAX_TYPES   5
 
 /*
  * Common pciio bus provider data.  There should be one of these as the