diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
| commit | 708b8eae0fd532af73ea8350e6dcc10255ff7376 (patch) | |
| tree | f336436934fd79bc91aff7112a9beb10bc4e839f /arch/cris/arch-v32/kernel/pinmux.c | |
| parent | d98d38f2014ab79f28c126ff175d034891f7aefc (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'arch/cris/arch-v32/kernel/pinmux.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/pinmux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/cris/arch-v32/kernel/pinmux.c b/arch/cris/arch-v32/kernel/pinmux.c index a2b8aa37c1bf..6eb54ea1c976 100644 --- a/arch/cris/arch-v32/kernel/pinmux.c +++ b/arch/cris/arch-v32/kernel/pinmux.c | |||
| @@ -11,10 +11,10 @@ | |||
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 13 | #include <linux/spinlock.h> | 13 | #include <linux/spinlock.h> |
| 14 | #include <asm/arch/hwregs/reg_map.h> | 14 | #include <arch/hwregs/reg_map.h> |
| 15 | #include <asm/arch/hwregs/reg_rdwr.h> | 15 | #include <arch/hwregs/reg_rdwr.h> |
| 16 | #include <asm/arch/pinmux.h> | 16 | #include <arch/pinmux.h> |
| 17 | #include <asm/arch/hwregs/pinmux_defs.h> | 17 | #include <arch/hwregs/pinmux_defs.h> |
| 18 | 18 | ||
| 19 | #undef DEBUG | 19 | #undef DEBUG |
| 20 | 20 | ||