diff options
| -rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 3888b43e1b31..cc0fffce94a6 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
| @@ -38,9 +38,6 @@ | |||
| 38 | #ifdef CONFIG_REGULATOR_FIXED_VOLTAGE | 38 | #ifdef CONFIG_REGULATOR_FIXED_VOLTAGE |
| 39 | #include <linux/regulator/fixed.h> | 39 | #include <linux/regulator/fixed.h> |
| 40 | #endif | 40 | #endif |
| 41 | #ifdef CONFIG_REGULATOR_AD5398 | ||
| 42 | #include <linux/regulator/ad5398.h> | ||
| 43 | #endif | ||
| 44 | #include <linux/regulator/machine.h> | 41 | #include <linux/regulator/machine.h> |
| 45 | #include <linux/regulator/consumer.h> | 42 | #include <linux/regulator/consumer.h> |
| 46 | #include <linux/regulator/userspace-consumer.h> | 43 | #include <linux/regulator/userspace-consumer.h> |
| @@ -2146,12 +2143,6 @@ static struct regulator_init_data ad5398_regulator_data = { | |||
| 2146 | .consumer_supplies = &ad5398_consumer, | 2143 | .consumer_supplies = &ad5398_consumer, |
| 2147 | }; | 2144 | }; |
| 2148 | 2145 | ||
| 2149 | static struct ad5398_platform_data ad5398_i2c_platform_data = { | ||
| 2150 | .current_bits = 10, | ||
| 2151 | .current_offset = 4, | ||
| 2152 | .regulator_data = &ad5398_regulator_data, | ||
| 2153 | }; | ||
| 2154 | |||
| 2155 | #if defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER) || \ | 2146 | #if defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER) || \ |
| 2156 | defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER_MODULE) | 2147 | defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER_MODULE) |
| 2157 | static struct platform_device ad5398_virt_consumer_device = { | 2148 | static struct platform_device ad5398_virt_consumer_device = { |
| @@ -2393,7 +2384,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
| 2393 | #if defined(CONFIG_REGULATOR_AD5398) || defined(CONFIG_REGULATOR_AD5398_MODULE) | 2384 | #if defined(CONFIG_REGULATOR_AD5398) || defined(CONFIG_REGULATOR_AD5398_MODULE) |
| 2394 | { | 2385 | { |
| 2395 | I2C_BOARD_INFO("ad5398", 0xC), | 2386 | I2C_BOARD_INFO("ad5398", 0xC), |
| 2396 | .platform_data = (void *)&ad5398_i2c_platform_data, | 2387 | .platform_data = (void *)&ad5398_regulator_data, |
| 2397 | }, | 2388 | }, |
| 2398 | #endif | 2389 | #endif |
| 2399 | #if defined(CONFIG_BACKLIGHT_ADP8860) || defined(CONFIG_BACKLIGHT_ADP8860_MODULE) | 2390 | #if defined(CONFIG_BACKLIGHT_ADP8860) || defined(CONFIG_BACKLIGHT_ADP8860_MODULE) |
