diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-05 07:50:11 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-05 07:50:11 +0200 |
| commit | 45605a87b3f34fb71bbc6446e2d49a469e9e10dd (patch) | |
| tree | fe46494f2f390288edf1b1a0b02fabf6d4a739a0 /arch/arm/mach-mx3/devices.c | |
| parent | a09f73fabbeac81f45969ad9ed59e74fae736873 (diff) | |
| parent | 6c20c807cf5a13f61193d39bb718f7a9b5df3813 (diff) | |
| download | talos-op-linux-45605a87b3f34fb71bbc6446e2d49a469e9e10dd.tar.gz talos-op-linux-45605a87b3f34fb71bbc6446e2d49a469e9e10dd.zip | |
Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'arch/arm/mach-mx3/devices.c')
| -rw-r--r-- | arch/arm/mach-mx3/devices.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index 90eccba66d00..a4fd1a26fc91 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c @@ -327,14 +327,14 @@ static struct resource imx_ssi_resources1[] = { }; struct platform_device imx_ssi_device0 = { - .name = "imx-ssi-dai", + .name = "imx-ssi", .id = 0, .num_resources = ARRAY_SIZE(imx_ssi_resources0), .resource = imx_ssi_resources0, }; struct platform_device imx_ssi_device1 = { - .name = "imx-ssi-dai", + .name = "imx-ssi", .id = 1, .num_resources = ARRAY_SIZE(imx_ssi_resources1), .resource = imx_ssi_resources1, |
