diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-03 20:10:13 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-03 20:10:13 +0200 |
| commit | ce38019845b1f3813c6aabd1cc6bdeac14c9ac3e (patch) | |
| tree | 150c1d09c84b4bef643249f0cd262059d68ca726 /arch/arm/mach-at91/at91rm9200_devices.c | |
| parent | 71fadbafe2274e29787e666f1d6b6529bb897ef8 (diff) | |
| parent | bd20ba67987875283cabba9e9e813e6dc355281a (diff) | |
| download | barebox-ce38019845b1f3813c6aabd1cc6bdeac14c9ac3e.tar.gz barebox-ce38019845b1f3813c6aabd1cc6bdeac14c9ac3e.tar.xz | |
Merge branch 'next'
Conflicts:
common/hush.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-at91/at91rm9200_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91rm9200_devices.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index 7e721e5ccf..a165cc9459 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -38,8 +38,8 @@ void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data) if (!data) return; - add_generic_device("at91_ohci", -1, NULL, AT91RM9200_UHP_BASE, 1024 * 1024, - IORESOURCE_MEM, data); + add_generic_device("at91_ohci", DEVICE_ID_DYNAMIC, NULL, AT91RM9200_UHP_BASE, + 1024 * 1024, IORESOURCE_MEM, data); } #else void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data) {} @@ -60,8 +60,8 @@ void __init at91_add_device_udc(struct at91_udc_data *data) if (data->pullup_pin > 0) at91_set_gpio_output(data->pullup_pin, 0); - add_generic_device("at91_udc", -1, NULL, AT91RM9200_BASE_UDP, SZ_16K, - IORESOURCE_MEM, data); + add_generic_device("at91_udc", DEVICE_ID_DYNAMIC, NULL, AT91RM9200_BASE_UDP, + SZ_16K, IORESOURCE_MEM, data); } #else void __init at91_add_device_udc(struct at91_udc_data *data) {} |