git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
mux.c
diff --git
a/arch/arm/mach-omap2/mux.c
b/arch/arm/mach-omap2/mux.c
index
9307700
..
443d07f
100644
(file)
--- a/
arch/arm/mach-omap2/mux.c
+++ b/
arch/arm/mach-omap2/mux.c
@@
-29,8
+29,8
@@
#include <asm/io.h>
#include <linux/spinlock.h>
#include <asm/io.h>
#include <linux/spinlock.h>
-#include <
asm/ar
ch/control.h>
-#include <
asm/ar
ch/mux.h>
+#include <
ma
ch/control.h>
+#include <
ma
ch/mux.h>
#ifdef CONFIG_OMAP_MUX
#ifdef CONFIG_OMAP_MUX
@@
-236,7
+236,7
@@
void __init_or_module omap2_cfg_debug(const struct pin_config *cfg, u8 reg)
warn = (orig != reg);
if (debug || warn)
printk(KERN_WARNING
warn = (orig != reg);
if (debug || warn)
printk(KERN_WARNING
- "MUX: setup %s (0x%
08x): 0x%02x -> 0x%02
x\n",
+ "MUX: setup %s (0x%
p): 0x%04x -> 0x%04
x\n",
cfg->name, omap_ctrl_base_get() + cfg->mux_reg,
orig, reg);
}
cfg->name, omap_ctrl_base_get() + cfg->mux_reg,
orig, reg);
}