projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-at91
/
at91sam9263_devices.c
diff --git
a/arch/arm/mach-at91/at91sam9263_devices.c
b/arch/arm/mach-at91/at91sam9263_devices.c
index
7c0898f
..
8dde220
100644
(file)
--- a/
arch/arm/mach-at91/at91sam9263_devices.c
+++ b/
arch/arm/mach-at91/at91sam9263_devices.c
@@
-599,7
+599,7
@@
static struct resource twi_resources[] = {
};
static struct platform_device at91sam9263_twi_device = {
- .name = "
at91_i2c
",
+ .name = "
i2c-at91sam9260
",
.id = -1,
.resource = twi_resources,
.num_resources = ARRAY_SIZE(twi_resources),