diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-18 08:17:32 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-18 08:17:32 +0300 |
| commit | 60747ef4d173c2747bf7f0377fb22846cb422195 (patch) | |
| tree | ea0faf33b952495c47909be1400c475a3f3821b0 /arch/m68k/bvme6000/config.c | |
| parent | 484334198f8ce9552e20930fff9408ebf6bcf94d (diff) | |
| parent | 184ca823481c99dadd7d946e5afd4bb921eab30d (diff) | |
| download | linux-60747ef4d173c2747bf7f0377fb22846cb422195.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes for both merge conflicts.
Resolution work done by Stephen Rothwell was used
as a reference.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/m68k/bvme6000/config.c')
| -rw-r--r-- | arch/m68k/bvme6000/config.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c index 478623dbb209..611d4d9ea2bd 100644 --- a/arch/m68k/bvme6000/config.c +++ b/arch/m68k/bvme6000/config.c @@ -34,7 +34,6 @@ #include <asm/setup.h> #include <asm/irq.h> #include <asm/traps.h> -#include <asm/rtc.h> #include <asm/machdep.h> #include <asm/bvme6000hw.h> |