Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-pull

[linux-2.6-omap-h63xx.git] / include / linux / mfd / asic3.h

diff --git a/include/linux/mfd/asic3.h b/include/linux/mfd/asic3.h
index 8f8c46c41f4497af701d3e3d18c33fd20555144e..322cd6deb9f087d785b59e3c5f72ccdf7fd82e8e 100644 (file)
--- a/include/linux/mfd/asic3.h
+++ b/include/linux/mfd/asic3.h
@@ -20,8 +20,6 @@ struct asic3_platform_data {
        u16 *gpio_config;
        unsigned int gpio_config_num;
 
-       unsigned int bus_shift;
-
        unsigned int irq_base;
 
        unsigned int gpio_base;
@@ -498,6 +496,7 @@ struct asic3_platform_data {
 #define ASIC3_SDIO_CTRL_LEDCtrl              0x7C
 #define ASIC3_SDIO_CTRL_SoftwareReset        0x1C0
 
-#define ASIC3_MAP_SIZE                      0x2000
+#define ASIC3_MAP_SIZE_32BIT   0x2000
+#define ASIC3_MAP_SIZE_16BIT   0x1000
 
 #endif /* __ASIC3_H__ */