On 27 July 2012 12:06, Andrew 'Necromant' Andrianov <[email protected]> wrote:
> Signed-off-by: Andrew 'Necromant' Andrianov <[email protected]>
> ---
>  .../files/arch/mips/ath79/mach-mercury-mw150r.c    |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mercury-mw150r.c 
> b/target/linux/ar71xx/files/arch/mips/ath79/mach-mercury-mw150r.c
> index 73a5473..1efe96d 100644
> --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-mercury-mw150r.c
> +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mercury-mw150r.c
> @@ -12,7 +12,7 @@
>  #include <asm/mach-ath79/ar71xx_regs.h>
>
>  #include "common.h"
> -#include "dev-ap9x-pci.h"
> +#include "dev-wmac.h"
>  #include "dev-eth.h"
>  #include "dev-gpio-buttons.h"
>  #include "dev-leds-gpio.h"
> @@ -113,8 +113,8 @@ static void __init mw150r_setup(void)
>         /* WAN port */
>         ath79_register_eth(0);
>
> -       ap9x_pci_setup_wmac_led_pin(0, 1);
> -       ap91_pci_init(ee, mac);
> +        ath79_register_wmac(ee, mac);
> +

You introduced this file in 2/11 yourself, so please fold this also
into the earlier patch.


Jonas
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to