aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/gpmc-smsc911x.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/gpmc-smsc911x.c b/arch/arm/mach-omap2/gpmc-smsc911x.c
index aa0c296ff34a..f9446eaf9176 100644
--- a/arch/arm/mach-omap2/gpmc-smsc911x.c
+++ b/arch/arm/mach-omap2/gpmc-smsc911x.c
@@ -39,7 +39,6 @@ static struct smsc911x_platform_config gpmc_smsc911x_config = {
39 .phy_interface = PHY_INTERFACE_MODE_MII, 39 .phy_interface = PHY_INTERFACE_MODE_MII,
40 .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW, 40 .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
41 .irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN, 41 .irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
42 .flags = SMSC911X_USE_16BIT,
43}; 42};
44 43
45static struct regulator_consumer_supply gpmc_smsc911x_supply[] = { 44static struct regulator_consumer_supply gpmc_smsc911x_supply[] = {
@@ -135,8 +134,7 @@ void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *gpmc_cfg)
135 gpio_set_value(gpmc_cfg->gpio_reset, 1); 134 gpio_set_value(gpmc_cfg->gpio_reset, 1);
136 } 135 }
137 136
138 if (gpmc_cfg->flags) 137 gpmc_smsc911x_config.flags = gpmc_cfg->flags ? : SMSC911X_USE_16BIT;
139 gpmc_smsc911x_config.flags = gpmc_cfg->flags;
140 138
141 pdev = platform_device_register_resndata(NULL, "smsc911x", gpmc_cfg->id, 139 pdev = platform_device_register_resndata(NULL, "smsc911x", gpmc_cfg->id,
142 gpmc_smsc911x_resources, ARRAY_SIZE(gpmc_smsc911x_resources), 140 gpmc_smsc911x_resources, ARRAY_SIZE(gpmc_smsc911x_resources),