diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-23 03:41:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-23 03:41:16 -0400 |
| commit | c5e40ee287db61a79af1746954ee03ebbf1ff8a3 (patch) | |
| tree | 007da00e75e9b84766ac4868421705300e1e2e14 /arch/m68k/include/asm/coldfire.h | |
| parent | 052831879945be0d9fad2216b127147c565ec1b1 (diff) | |
| parent | c5dfd654d0ec0a28fe81e7bd4d4fd984a9855e09 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/bridge/br_mdb.c
br_mdb.c conflict was a function call being removed to fix a bug in
'net' but whose signature was changed in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/m68k/include/asm/coldfire.h')
| -rw-r--r-- | arch/m68k/include/asm/coldfire.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/coldfire.h b/arch/m68k/include/asm/coldfire.h index c94557b91448..50aa4dac9ca2 100644 --- a/arch/m68k/include/asm/coldfire.h +++ b/arch/m68k/include/asm/coldfire.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | * in any case new boards come along from time to time that have yet | 19 | * in any case new boards come along from time to time that have yet |
| 20 | * another different clocking frequency. | 20 | * another different clocking frequency. |
| 21 | */ | 21 | */ |
| 22 | #ifdef CONFIG_CLOCK_SET | 22 | #ifdef CONFIG_CLOCK_FREQ |
| 23 | #define MCF_CLK CONFIG_CLOCK_FREQ | 23 | #define MCF_CLK CONFIG_CLOCK_FREQ |
| 24 | #else | 24 | #else |
| 25 | #error "Don't know what your ColdFire CPU clock frequency is??" | 25 | #error "Don't know what your ColdFire CPU clock frequency is??" |