Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330037
b: refs/heads/master
c: 666e81f
h: refs/heads/master
i:
  330035: 9d3ed12
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Oct 5, 2012
1 parent e1fc8f2 commit 769854e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 458fe42529a2510c026afa8fc04f07d2f9d8ab78
refs/heads/master: 666e81fdca5486cad644ee3fb64bb7d83e2f3723
2 changes: 1 addition & 1 deletion trunk/arch/sh/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ __BUILD_MEMORY_STRING(__raw_, q, u64)
* load/store instructions. sh_io_port_base is the virtual address to
* which all ports are being mapped.
*/
extern const unsigned long sh_io_port_base;
extern unsigned long sh_io_port_base;

static inline void __set_io_port_base(unsigned long pbase)
{
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/sh/kernel/ioport.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 769854e

Please sign in to comment.