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

Commit 077a6c26 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] BCM1480: include <linux/init.h>.
  [MIPS] BCM1480: Export zbbus_mhz.
parents 73e83dc3 da51f9e1

arch/mips/sibyte/bcm1480/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/reboot.h>
@@ -35,6 +36,7 @@ unsigned int soc_type; 
EXPORT_SYMBOL(soc_type);

unsigned int periph_rev;

unsigned int zbbus_mhz;

EXPORT_SYMBOL(zbbus_mhz);



static unsigned int part_type;