Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / include / asm-ppc / ocp_ids.h

diff --git a/include/asm-ppc/ocp_ids.h b/include/asm-ppc/ocp_ids.h
index da5ad07..5d4ad8a 100644 (file)
--- a/include/asm-ppc/ocp_ids.h
+++ b/include/asm-ppc/ocp_ids.h
@@ -45,6 +45,7 @@
 
 /* Memory devices 0x0090 - 0x009F */
 #define OCP_FUNC_MAL           0x0090
+#define OCP_FUNC_DMA           0x0091
 
 /* Display 0x00A0 - 0x00AF */
 
@@ -62,7 +63,7 @@
 
 /* Network 0x0200 - 0x02FF */
 #define OCP_FUNC_EMAC          0x0200
-#define OCP_FUNC_ENET          0x0201  /* TSEC & FEC */
+#define OCP_FUNC_GFAR          0x0201  /* TSEC & FEC */
 
 /* Bridge devices 0xE00 - 0xEFF */
 #define OCP_FUNC_OPB           0x0E00