projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iio-fixes-for-3.15a' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
arm
/
mach-at91
/
at91sam9g45_devices.c
diff --git
a/arch/arm/mach-at91/at91sam9g45_devices.c
b/arch/arm/mach-at91/at91sam9g45_devices.c
index 77b04c2edd783485d89f229a5c9c075bc68ab468..dab362c06487a856c9bcac67dd9248903c133fcd 100644
(file)
--- a/
arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/
arch/arm/mach-at91/at91sam9g45_devices.c
@@
-1204,7
+1204,7
@@
static struct resource adc_resources[] = {
};
static struct platform_device at91_adc_device = {
- .name = "at91
_
adc",
+ .name = "at91
sam9g45-
adc",
.id = -1,
.dev = {
.platform_data = &adc_data,