diff options
| author | James Morris <james.morris@microsoft.com> | 2019-01-22 14:33:10 -0800 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-01-22 14:33:10 -0800 |
| commit | 9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a (patch) | |
| tree | e9c1e5d2400ad20c5a9cd633b52a42a00d1d98cb /arch/arm/mach-davinci/board-omapl138-hawk.c | |
| parent | 3e8c73671244af16f1a6042f1c10d13b75cd1156 (diff) | |
| parent | 49a57857aeea06ca831043acbb0fa5e0f50602fd (diff) | |
Merge tag 'v5.0-rc3' into next-general
Sync to Linux 5.0-rc3 to pull in the VFS changes which impacted a lot
of the LSM code.
Diffstat (limited to 'arch/arm/mach-davinci/board-omapl138-hawk.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-omapl138-hawk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 8e8d51f4a276..94c4f126ef86 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -134,9 +134,9 @@ static const short hawk_mmcsd0_pins[] = { static struct gpiod_lookup_table mmc_gpios_table = { .dev_id = "da830-mmc.0", .table = { - GPIO_LOOKUP("davinci_gpio.0", DA850_HAWK_MMCSD_CD_PIN, "cd", + GPIO_LOOKUP("davinci_gpio", DA850_HAWK_MMCSD_CD_PIN, "cd", GPIO_ACTIVE_LOW), - GPIO_LOOKUP("davinci_gpio.0", DA850_HAWK_MMCSD_WP_PIN, "wp", + GPIO_LOOKUP("davinci_gpio", DA850_HAWK_MMCSD_WP_PIN, "wp", GPIO_ACTIVE_LOW), }, }; |