diff options
| author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2015-03-25 10:03:07 +0100 |
|---|---|---|
| committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2015-03-25 10:03:07 +0100 |
| commit | 3527a86b7ae17c949307d00e1eb7087604bca1b4 (patch) | |
| tree | 8e8eab905e7e73a3bf2c4d47abd356166533c9db /arch/arm/mach-sa1100/neponset.c | |
| parent | UBI: fix missing brace control flow (diff) | |
| parent | Linux 4.0-rc5 (diff) | |
| download | linux-3527a86b7ae17c949307d00e1eb7087604bca1b4.tar.xz linux-3527a86b7ae17c949307d00e1eb7087604bca1b4.zip | |
Merge tag 'v4.0-rc5' into linux-next
Merge the upstream -rc5 tag because we needed a more up-to-date base our
further work.
Diffstat (limited to 'arch/arm/mach-sa1100/neponset.c')
| -rw-r--r-- | arch/arm/mach-sa1100/neponset.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c index 169262e3040d..af868d258e66 100644 --- a/arch/arm/mach-sa1100/neponset.c +++ b/arch/arm/mach-sa1100/neponset.c @@ -12,6 +12,7 @@ #include <linux/pm.h> #include <linux/serial_core.h> #include <linux/slab.h> +#include <linux/smc91x.h> #include <asm/mach-types.h> #include <asm/mach/map.h> @@ -258,12 +259,17 @@ static int neponset_probe(struct platform_device *dev) 0x02000000, "smc91x-attrib"), { .flags = IORESOURCE_IRQ }, }; + struct smc91x_platdata smc91x_platdata = { + .flags = SMC91X_USE_8BIT | SMC91X_IO_SHIFT_2 | SMC91X_NOWAIT, + }; struct platform_device_info smc91x_devinfo = { .parent = &dev->dev, .name = "smc91x", .id = 0, .res = smc91x_resources, .num_res = ARRAY_SIZE(smc91x_resources), + .data = &smc91x_platdata, + .size_data = sizeof(smc91x_platdata), }; int ret, irq; |