4 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-w90x900/clksel.c b/arch/arm/mach-w90x900/clksel.c
index 3de4a5211c3b..06d867dce551 100644
--- a/arch/arm/mach-w90x900/clksel.c
+++ b/arch/arm/mach-w90x900/clksel.c
@@ -48,7 +48,7 @@ static void clock_source_select(const char *dev_id, unsigned int clkval)
                 offset = ATAOFFSET;
         else if (strcmp(dev_id, "nuc900-lcd") == 0)
                 offset = LCDOFFSET;
-        else if (strcmp(dev_id, "nuc900-audio") == 0)
+        else if (strcmp(dev_id, "nuc900-ac97") == 0)
                 offset = AUDOFFSET;
         else
                 offset = CPUOFFSET;
diff --git a/arch/arm/mach-w90x900/cpu.c b/arch/arm/mach-w90x900/cpu.c
index 604e1db266e8..9a0661992909 100644
--- a/arch/arm/mach-w90x900/cpu.c
+++ b/arch/arm/mach-w90x900/cpu.c
@@ -79,7 +79,7 @@ static DEFINE_CLK(timer4, 23);
 
 static struct clk_lookup nuc900_clkregs[] = {
         DEF_CLKLOOK(&clk_lcd, "nuc900-lcd", NULL),
-        DEF_CLKLOOK(&clk_audio, "nuc900-audio", NULL),
+        DEF_CLKLOOK(&clk_audio, "nuc900-ac97", NULL),
         DEF_CLKLOOK(&clk_fmi, "nuc900-fmi", NULL),
         DEF_CLKLOOK(&clk_ms, "nuc900-fmi", "MS"),
         DEF_CLKLOOK(&clk_sd, "nuc900-fmi", "SD"),
diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c
index 5b0c38abacc1..78110befb7a9 100644
--- a/arch/arm/mach-w90x900/dev.c
+++ b/arch/arm/mach-w90x900/dev.c
@@ -501,8 +501,8 @@ static struct resource nuc900_ac97_resource[] = {
 
 };
 
-struct platform_device nuc900_device_audio = {
-        .name           = "nuc900-audio",
+struct platform_device nuc900_device_ac97 = {
+        .name           = "nuc900-ac97",
         .id             = -1,
         .num_resources  = ARRAY_SIZE(nuc900_ac97_resource),
         .resource       = nuc900_ac97_resource,
@@ -523,7 +523,7 @@ static struct platform_device *nuc900_public_dev[] __initdata = {
         &nuc900_device_emc,
         &nuc900_device_spi,
         &nuc900_device_wdt,
-        &nuc900_device_audio,
+        &nuc900_device_ac97,
 };
 
 /* Provide adding specific CPU platform devices API */
diff --git a/arch/arm/mach-w90x900/mfp.c b/arch/arm/mach-w90x900/mfp.c
index 9dd74612bb87..c58d142b8a46 100644
--- a/arch/arm/mach-w90x900/mfp.c
+++ b/arch/arm/mach-w90x900/mfp.c
@@ -155,7 +155,7 @@ void mfp_set_groupg(struct device *dev, const char *subname)
         } else if (strcmp(dev_id, "nuc900-i2c1") == 0) {
                 mfpen &= ~(GPIOG2TO3);
                 mfpen |= ENI2C1;/*enable i2c1*/
-        } else if (strcmp(dev_id, "nuc900-audio") == 0) {
+        } else if (strcmp(dev_id, "nuc900-ac97") == 0) {
                 mfpen &= ~(GPIOG22TO23);
                 mfpen |= ENAC97;/*enable AC97*/
         } else if (strcmp(dev_id, "nuc900-mmc-port1") == 0) {