Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...

[~andy/linux] / arch / sh / kernel / ioport.c

diff --git a/arch/sh/kernel/ioport.c b/arch/sh/kernel/ioport.c
index e3ad6103e7c181ba955b2c9967a41a8a61659eb7..cca14ba84a379fea07bb74ddaabb02bb062cd649 100644 (file)
--- a/arch/sh/kernel/ioport.c
+++ b/arch/sh/kernel/ioport.c
@@ -11,7 +11,7 @@
 #include <linux/module.h>
 #include <linux/io.h>
 
-const unsigned long sh_io_port_base __read_mostly = -1;
+unsigned long sh_io_port_base __read_mostly = -1;
 EXPORT_SYMBOL(sh_io_port_base);
 
 void __iomem *__ioport_map(unsigned long addr, unsigned int size)