Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 21 insertions, 0 deletions

diff --git a/arch/mips/alchemy/devboards/platform.h b/arch/mips/alchemy/devboards/platform.h
new file mode 100644
index 000000000000..5ac055d2cda9
--- /dev/null
+++ b/arch/mips/alchemy/devboards/platform.h
@@ -0,0 +1,21 @@
+#ifndef _DEVBOARD_PLATFORM_H_
+#define _DEVBOARD_PLATFORM_H_
+
+#include <linux/init.h>
+
+int __init db1x_register_pcmcia_socket(phys_addr_t pcmcia_attr_start,
+                                       phys_addr_t pcmcia_attr_len,
+                                       phys_addr_t pcmcia_mem_start,
+                                       phys_addr_t pcmcia_mem_end,
+                                       phys_addr_t pcmcia_io_start,
+                                       phys_addr_t pcmcia_io_end,
+                                       int card_irq,
+                                       int cd_irq,
+                                       int stschg_irq,
+                                       int eject_irq,
+                                       int id);
+
+int __init db1x_register_norflash(unsigned long size, int width,
+                                  int swapped);
+
+#endif