Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=69b2e99cf57ab8121d575a04a050314ac9c8f7e1
Commit:     69b2e99cf57ab8121d575a04a050314ac9c8f7e1
Parent:     c9b75d132261096ac1170354b9e27837af76a512
Author:     Andrew Victor <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 14 08:44:43 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Wed Feb 14 15:22:09 2007 +0000

    [ARM] 4189/1: AT91: MACB Ethernet clock
    
    The MACB Ethernet driver searches for a "macb_clk" clock, so rename the
    "ether_clk" on the SAM9260 and SAM9263 to "macb_clk".
    
    Signed-off-by: Andrew Victor <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-at91/at91sam9260.c |    6 +++---
 arch/arm/mach-at91/at91sam9263.c |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index e03ee62..86e3a4c 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -127,8 +127,8 @@ static struct clk ohci_clk = {
        .pmc_mask       = 1 << AT91SAM9260_ID_UHP,
        .type           = CLK_TYPE_PERIPHERAL,
 };
-static struct clk ether_clk = {
-       .name           = "ether_clk",
+static struct clk macb_clk = {
+       .name           = "macb_clk",
        .pmc_mask       = 1 << AT91SAM9260_ID_EMAC,
        .type           = CLK_TYPE_PERIPHERAL,
 };
@@ -186,7 +186,7 @@ static struct clk *periph_clocks[] __initdata = {
        &tc1_clk,
        &tc2_clk,
        &ohci_clk,
-       &ether_clk,
+       &macb_clk,
        &isi_clk,
        &usart3_clk,
        &usart4_clk,
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index fae6a82..6aa342e 100644
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -107,8 +107,8 @@ static struct clk tcb_clk = {
        .pmc_mask       = 1 << AT91SAM9263_ID_TCB,
        .type           = CLK_TYPE_PERIPHERAL,
 };
-static struct clk ether_clk = {
-       .name           = "ether_clk",
+static struct clk macb_clk = {
+       .name           = "macb_clk",
        .pmc_mask       = 1 << AT91SAM9263_ID_EMAC,
        .type           = CLK_TYPE_PERIPHERAL,
 };
@@ -150,7 +150,7 @@ static struct clk *periph_clocks[] __initdata = {
        // ac97
        &tcb_clk,
        // pwmc
-       &ether_clk,
+       &macb_clk,
        // 2dge
        &udc_clk,
        &isi_clk,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to