diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-05-19 17:21:37 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-20 17:27:10 +0200 |
| commit | d28f1db8187dd1ddc1fa6f380ff0402cf8e4d44d (patch) | |
| tree | e736cddf25b387da59b3a8d0a65c257f87e158c6 /arch/arm | |
| parent | 1cb3642a68c983ada0f4090a4dac1d70a96126ca (diff) | |
| download | blackbird-op-linux-d28f1db8187dd1ddc1fa6f380ff0402cf8e4d44d.tar.gz blackbird-op-linux-d28f1db8187dd1ddc1fa6f380ff0402cf8e4d44d.zip | |
mfd: Remove confusing ab8500-i2c file and merge into ab8500-core
ab8500-i2c is used as core code to register the ab8500 device.
After allocating ab8500 memory, it immediately calls into
ab8500-core where the real initialisation takes place. This
patch moves all core registration and memory allocation into
the true ab8500-core file and removes ab8500-i2c completely.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 77d03c1fbd04..6dd632d8a809 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -205,7 +205,7 @@ static struct resource ab8500_resources[] = { }; struct platform_device ab8500_device = { - .name = "ab8500-i2c", + .name = "ab8500-core", .id = 0, .dev = { .platform_data = &ab8500_platdata, |
