summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-04-15 16:31:43 +0000
committerMike Frysinger <vapier@gentoo.org>2010-05-22 14:19:08 -0400
commit11cabcb95e0d9de15f3d8a9d25336edfc5444337 (patch)
tree9d929ae29a447f37f4358cf36fe1f9956948e5c6 /arch
parentd2db97bf6bafde4ec114d1837dd3fc4cea64b2ea (diff)
downloadlinux-11cabcb95e0d9de15f3d8a9d25336edfc5444337.tar.gz
linux-11cabcb95e0d9de15f3d8a9d25336edfc5444337.tar.bz2
linux-11cabcb95e0d9de15f3d8a9d25336edfc5444337.zip
Blackfin: bf537-minotaur: fix build errors due to header changes
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/mach-bf537/boards/minotaur.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c
index c489d602c590..05d45994480e 100644
--- a/arch/blackfin/mach-bf537/boards/minotaur.c
+++ b/arch/blackfin/mach-bf537/boards/minotaur.c
@@ -23,12 +23,13 @@
#include <asm/dma.h>
#include <asm/bfin5xx_spi.h>
#include <asm/reboot.h>
+#include <asm/portmux.h>
#include <linux/spi/ad7877.h>
/*
* Name the Board for the /proc/cpuinfo
*/
-char *bfin_board_name = "CamSig Minotaur BF537";
+const char bfin_board_name[] = "CamSig Minotaur BF537";
#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
static struct resource bfin_pcmcia_cf_resources[] = {