Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-omap / menelaus.h

diff --git a/include/asm-arm/arch-omap/menelaus.h b/include/asm-arm/arch-omap/menelaus.h
index 0c401c4eb7f2c015d8e09aa8b62dff0c4a5bdf9b..e1012c1c54a91d7bedd61109c8661f84c2f57dec 100644 (file)
--- a/include/asm-arm/arch-omap/menelaus.h
+++ b/include/asm-arm/arch-omap/menelaus.h
@@ -13,14 +13,12 @@ struct menelaus_platform_data {
        int (* late_init)(struct device *dev);
 };
 
-/* Call only at init time. */
-extern void menelaus_set_platform_data(struct menelaus_platform_data *pdata);
-
 extern int menelaus_register_mmc_callback(void (*callback)(void *data, u8 card_mask),
                                          void *data);
 extern void menelaus_unregister_mmc_callback(void);
 extern int menelaus_set_mmc_opendrain(int slot, int enable);
 extern int menelaus_set_mmc_slot(int slot, int enable, int power, int cd_on);
+extern int menelaus_enable_slot(int slot, int enable);
 
 extern int menelaus_set_vmem(unsigned int mV);
 extern int menelaus_set_vio(unsigned int mV);