atheros: use NULL instead of plain integer

[openwrt/openwrt.git] / target / linux / atheros / patches-3.14 / 100-board.patch

diff --git a/target/linux/atheros/patches-3.14/100-board.patch b/target/linux/atheros/patches-3.14/100-board.patch
index a45664ac42b8069ffa3292f2f4a507b211effcd0..c60c9e374000568a7edee12f1701a34e5f132ee1 100644 (file)
--- a/target/linux/atheros/patches-3.14/100-board.patch
+++ b/target/linux/atheros/patches-3.14/100-board.patch
@@ -84,7 +84,7 @@
 +obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
 --- /dev/null
 +++ b/arch/mips/ar231x/board.c
-@@ -0,0 +1,261 @@
+@@ -0,0 +1,263 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -109,6 +109,8 @@
 +#include <linux/io.h>
 +#include <asm/irq_cpu.h>
 +#include <asm/reboot.h>
++#include <asm/bootinfo.h>
++#include <asm/time.h>
 +
 +#include <ar231x_platform.h>
 +#include "devices.h"
@@ -210,7 +212,7 @@
 +
 +      if (!found) {
 +              pr_warn("WARNING: Could not find Radio Configuration data\n");
-+              radio_config = 0;
++              radio_config = NULL;
 +      }
 +
 +      return radio_config;
@@ -2697,11 +2699,11 @@
 +
 +#ifdef CONFIG_ATHEROS_AR2315
 +
-+extern void ar2315_irq_init(void);
-+extern int ar2315_init_devices(void);
-+extern void ar2315_prom_init(void);
-+extern void ar2315_plat_setup(void);
-+extern void ar2315_time_init(void);
++void ar2315_irq_init(void);
++int ar2315_init_devices(void);
++void ar2315_prom_init(void);
++void ar2315_plat_setup(void);
++void ar2315_time_init(void);
 +
 +#else
 +
@@ -2731,18 +2733,17 @@
 +#endif
 --- /dev/null
 +++ b/arch/mips/ar231x/ar5312.h
-@@ -0,0 +1,38 @@
+@@ -0,0 +1,37 @@
 +#ifndef __AR5312_H
 +#define __AR5312_H
 +
 +#ifdef CONFIG_ATHEROS_AR5312
 +
-+extern void ar5312_irq_init(void);
-+extern int ar5312_init_devices(void);
-+extern void ar5312_prom_init(void);
-+extern void ar5312_plat_setup(void);
-+extern void ar5312_time_init(void);
-+extern void ar5312_time_init(void);
++void ar5312_irq_init(void);
++int ar5312_init_devices(void);
++void ar5312_prom_init(void);
++void ar5312_plat_setup(void);
++void ar5312_time_init(void);
 +
 +#else
 +
@@ -2840,11 +2841,11 @@
 +extern struct ar231x_board_config ar231x_board;
 +extern asmlinkage void (*ar231x_irq_dispatch)(void);
 +
-+extern int ar231x_find_config(u8 *flash_limit);
-+extern void ar231x_serial_setup(u32 mapbase, int irq, unsigned int uartclk);
-+extern int ar231x_add_wmac(int nr, u32 base, int irq);
-+extern int ar231x_add_ethernet(int nr, u32 base, const char *mii_name,
-+                             u32 mii_base, int irq, void *pdata);
++int ar231x_find_config(u8 *flash_limit);
++void ar231x_serial_setup(u32 mapbase, int irq, unsigned int uartclk);
++int ar231x_add_wmac(int nr, u32 base, int irq);
++int ar231x_add_ethernet(int nr, u32 base, const char *mii_name, u32 mii_base,
++                      int irq, void *pdata);
 +
 +static inline bool is_2315(void)
 +{
@@ -2859,13 +2860,15 @@
 +#endif
 --- /dev/null
 +++ b/arch/mips/ar231x/devices.c
-@@ -0,0 +1,180 @@
+@@ -0,0 +1,182 @@
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +#include <linux/serial.h>
 +#include <linux/serial_core.h>
 +#include <linux/serial_8250.h>
 +#include <linux/platform_device.h>
++#include <asm/bootinfo.h>
++
 +#include <ar231x_platform.h>
 +#include <ar231x.h>
 +#include "devices.h"