summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/usb-a926x
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-09-05 12:59:29 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-09-05 12:59:29 +0200
commite141988898ffbef75e8c525347023d5941f7baad (patch)
treef5bcc3e5eaee6f83be63beb9e2e3839c5b6a1cfd /arch/arm/boards/usb-a926x
parent5d8accbe961059cd1a00353dfa6959bc0ee622b1 (diff)
parentad327344c94e8cb48c83ca984ff9e2343fbe9810 (diff)
downloadbarebox-e141988898ffbef75e8c525347023d5941f7baad.tar.gz
barebox-e141988898ffbef75e8c525347023d5941f7baad.tar.xz
Merge branch 'for-next/device-id'
Diffstat (limited to 'arch/arm/boards/usb-a926x')
-rw-r--r--arch/arm/boards/usb-a926x/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c
index 37f6fab61c..00a215d140 100644
--- a/arch/arm/boards/usb-a926x/init.c
+++ b/arch/arm/boards/usb-a926x/init.c
@@ -290,7 +290,7 @@ static void usb_a9260_keyboard_device_dab_mmx(void)
at91_set_deglitch(keys[i].gpio, 1);
}
- add_gpio_keys_device(-1, &gk_pdata);
+ add_gpio_keys_device(DEVICE_ID_DYNAMIC, &gk_pdata);
}
#else
static void usb_a9260_keyboard_device_dab_mmx(void) {}