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

Commit 09a3fba8 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Kumar Gala
Browse files

powerpc/qe: Move cmxgcr_lock definition from the ucc.c into the qe.c 



With this patch we can compile the qe_lib/usb.c without the UCC
support (that is, without UCC_GETH and/or SERIAL_QE).

Fixes following link error (CONFIG_SMP should be =y to trigger this):

arch/powerpc/sysdev/built-in.o: In function `qe_usb_clock_set':
(.text+0x3cae): undefined reference to `cmxgcr_lock'
make: *** [.tmp_vmlinux1] Error 1

While at it, also add missing spinlock.h includes.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Acked-By: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent d3a8cdab

arch/powerpc/sysdev/qe_lib/qe.c

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/kernel.h>

#include <linux/param.h>

#include <linux/string.h>

#include <linux/spinlock.h>

#include <linux/mm.h>

#include <linux/interrupt.h>

#include <linux/bootmem.h>
@@ -38,6 +39,8 @@ static void qe_snums_init(void); 
static int qe_sdma_init(void);



static DEFINE_SPINLOCK(qe_lock);

DEFINE_SPINLOCK(cmxgcr_lock);

EXPORT_SYMBOL(cmxgcr_lock);



/* QE snum state */

enum qe_snum_state {

arch/powerpc/sysdev/qe_lib/ucc.c

+1 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/errno.h>

#include <linux/slab.h>

#include <linux/stddef.h>

#include <linux/spinlock.h>

#include <linux/module.h>



#include <asm/irq.h>
@@ -26,9 +27,6 @@ 
#include <asm/qe.h>

#include <asm/ucc.h>



DEFINE_SPINLOCK(cmxgcr_lock);

EXPORT_SYMBOL(cmxgcr_lock);



int ucc_set_qe_mux_mii_mng(unsigned int ucc_num)

{

	unsigned long flags;