Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / include / asm-ppc / mpc10x.h

diff --git a/include/asm-ppc/mpc10x.h b/include/asm-ppc/mpc10x.h
index d8e7e2d6128e70f5f170f58188da06966485af50..77b1e092c206d109e6628225b70929ad968fe22c 100644 (file)
--- a/include/asm-ppc/mpc10x.h
+++ b/include/asm-ppc/mpc10x.h
@@ -159,6 +159,13 @@ extern unsigned long                       ioremap_base;
 #define        MPC10X_MAPA_EUMB_BASE           (ioremap_base - MPC10X_EUMB_SIZE)
 #define        MPC10X_MAPB_EUMB_BASE           MPC10X_MAPA_EUMB_BASE
 
+enum ppc_sys_devices {
+       MPC10X_IIC1,
+       MPC10X_DMA0,
+       MPC10X_DMA1,
+       MPC10X_UART0,
+       MPC10X_UART1,
+};
 
 int mpc10x_bridge_init(struct pci_controller *hose,
                       uint current_map,