"Mark A. Greer" <[email protected]> writes:
> From: Mark A. Greer <[email protected]>
>
> Fix the definitions of at24_setup() in two davinci board files
> that are incorrect.
>
> Signed-off-by: Mark A. Greer <[email protected]>
Thanks, pushing.
Kevin
> ---
> arch/arm/mach-davinci/board-dm644x-evm.c | 4 +---
> arch/arm/mach-davinci/board-dm646x-evm.c | 3 +--
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c
> b/arch/arm/mach-davinci/board-dm644x-evm.c
> index 5aeb085..384ad69 100644
> --- a/arch/arm/mach-davinci/board-dm644x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm644x-evm.c
> @@ -415,7 +415,7 @@ static struct pcf857x_platform_data pcf_data_u35 = {
> */
> static struct memory_accessor *at24_mem_acc;
>
> -static int at24_setup(struct memory_accessor *mem_acc, void *context)
> +static void at24_setup(struct memory_accessor *mem_acc, void *context)
> {
> DECLARE_MAC_BUF(mac_str);
> char mac_addr[6];
> @@ -429,8 +429,6 @@ static int at24_setup(struct memory_accessor *mem_acc,
> void *context)
>
> memcpy(dm644x_evm_emac_pdata.mac_addr, mac_addr, 6);
> }
> -
> - return 0;
> }
>
> static struct at24_platform_data eeprom_info = {
> diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c
> b/arch/arm/mach-davinci/board-dm646x-evm.c
> index bcf11d5..5dd3006 100644
> --- a/arch/arm/mach-davinci/board-dm646x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm646x-evm.c
> @@ -64,7 +64,7 @@ static struct davinci_uart_config uart_config __initdata = {
> */
> static struct memory_accessor *at24_mem_acc;
>
> -static int at24_setup(struct memory_accessor *mem_acc, void *context)
> +static void at24_setup(struct memory_accessor *mem_acc, void *context)
> {
> DECLARE_MAC_BUF(mac_str);
> char mac_addr[6];
> @@ -78,7 +78,6 @@ static int at24_setup(struct memory_accessor *mem_acc, void
> *context)
>
> memcpy(dm646x_evm_emac_pdata.mac_addr, mac_addr, 6);
> }
> - return 0;
> }
> static struct at24_platform_data eeprom_info = {
> .byte_len = (256*1024) / 8,
> --
> 1.6.0.3
>
>
> _______________________________________________
> Davinci-linux-open-source mailing list
> [email protected]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
