2008-06-05 18:30:38

by Adrian Bunk

Subject: [2.6 patch] include/linux/ssb/ssb_driver_gige.h typo fix

This patch fixes a typo in the name of a config variable.

Reported-by: Robert P. J. Day <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

---
2aab8eeb46b30baf987c344e1b144caec365373a diff --git a/include/linux/ssb/ssb_driver_gige.h b/include/linux/ssb/ssb_driver_gige.h
index 01fbdf5..942e387 100644
--- a/include/linux/ssb/ssb_driver_gige.h
+++ b/include/linux/ssb/ssb_driver_gige.h
@@ -100,7 +100,7 @@ extern char * nvram_get(const char *name);
/* Get the device MAC address */
static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
{
-#ifdef CONFIG_BCM947XX
+#ifdef CONFIG_BCM47XX
char *res = nvram_get("et0macaddr");
if (res)
memcpy(macaddr, res, 6);

2008-06-05 18:35:13

by Robert P. J. Day

Subject: Re: [2.6 patch] include/linux/ssb/ssb_driver_gige.h typo fix

On Thu, 5 Jun 2008, Adrian Bunk wrote:

> This patch fixes a typo in the name of a config variable.
>
> Reported-by: Robert P. J. Day <[email protected]>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
> 2aab8eeb46b30baf987c344e1b144caec365373a diff --git a/include/linux/ssb/ssb_driver_gige.h b/include/linux/ssb/ssb_driver_gige.h
> index 01fbdf5..942e387 100644
> --- a/include/linux/ssb/ssb_driver_gige.h
> +++ b/include/linux/ssb/ssb_driver_gige.h
> @@ -100,7 +100,7 @@ extern char * nvram_get(const char *name);
> /* Get the device MAC address */
> static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
> {
> -#ifdef CONFIG_BCM947XX
> +#ifdef CONFIG_BCM47XX
> char *res = nvram_get("et0macaddr");
> if (res)
> memcpy(macaddr, res, 6);
>

just FYI, there are more (admittedly aesthetic) references to
BCM947XX in the MIPS directory:

$ grep -r "BCM947XX" *
include/linux/ssb/ssb_driver_gige.h:#ifdef CONFIG_BCM947XX
include/asm-mips/mach-bcm47xx/war.h:#ifndef __ASM_MIPS_MACH_BCM947XX_WAR_H
include/asm-mips/mach-bcm47xx/war.h:#define __ASM_MIPS_MACH_BCM947XX_WAR_H
include/asm-mips/mach-bcm47xx/war.h:#endif /* __ASM_MIPS_MACH_BCM947XX_WAR_H */
$

whether you want to do anything about those is up to you.

rday
--

========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry:
Have classroom, will lecture.

http://crashcourse.ca Waterloo, Ontario, CANADA
========================================================================

2008-06-05 18:43:32

by Michael Büsch

Subject: Re: [2.6 patch] include/linux/ssb/ssb_driver_gige.h typo fix

On Thursday 05 June 2008 20:29:49 Adrian Bunk wrote:
> This patch fixes a typo in the name of a config variable.

Well, it's not a typo. It was renamed. Good catch anyway. :)

> Reported-by: Robert P. J. Day <[email protected]>
> Signed-off-by: Adrian Bunk <[email protected]>

Reviewed-by: Michael Buesch <[email protected]>

> ---
> 2aab8eeb46b30baf987c344e1b144caec365373a diff --git a/include/linux/ssb/ssb_driver_gige.h b/include/linux/ssb/ssb_driver_gige.h
> index 01fbdf5..942e387 100644
> --- a/include/linux/ssb/ssb_driver_gige.h
> +++ b/include/linux/ssb/ssb_driver_gige.h
> @@ -100,7 +100,7 @@ extern char * nvram_get(const char *name);
> /* Get the device MAC address */
> static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
> {
> -#ifdef CONFIG_BCM947XX
> +#ifdef CONFIG_BCM47XX
> char *res = nvram_get("et0macaddr");
> if (res)
> memcpy(macaddr, res, 6);
>
>
>



--
Greetings Michael.