Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 510ae0c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

Pull MIPS fix from Ralf Baechle:
 "Just a single revert for a patch which I had upstreamed out of
  sequence"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  Revert "MIPS: bcm63xx: nvram: Remove unused bcm63xx_nvram_get_psi_size() function"
parents d517be5f b0a119fd

arch/mips/bcm63xx/nvram.c

+11 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 


#include <bcm63xx_nvram.h>



#define BCM63XX_DEFAULT_PSI_SIZE	64



static struct bcm963xx_nvram nvram;

static int mac_addr_used;
@@ -85,3 +87,12 @@ int bcm63xx_nvram_get_mac_address(u8 *mac) 
	return 0;

}

EXPORT_SYMBOL(bcm63xx_nvram_get_mac_address);



int bcm63xx_nvram_get_psi_size(void)

{

	if (nvram.psi_size > 0)

		return nvram.psi_size;



	return BCM63XX_DEFAULT_PSI_SIZE;

}

EXPORT_SYMBOL(bcm63xx_nvram_get_psi_size);

arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h

+2 −0
Original line number Diff line number Diff line
@@ -30,4 +30,6 @@ u8 *bcm63xx_nvram_get_name(void); 
 */

int bcm63xx_nvram_get_mac_address(u8 *mac);



int bcm63xx_nvram_get_psi_size(void);



#endif /* BCM63XX_NVRAM_H */