diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-12 15:55:19 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-12 15:55:19 -0800 |
commit | 3b1b71950b81c4a20ae63c2322383ab4932cdabd (patch) | |
tree | 4ab1907249886ac5f410a81b9be8f2c977a10f7d /arch/m68k/sun3x | |
parent | c69e8839c230c60d3c5f62c8f88bd23d8d6519ee (diff) | |
parent | 877d52431f4d3cda4adea077ffbe88f3fd1755d3 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (30 commits)
m68k: Fix --build-id breakage for sun3
m68k: Wire up sys_restart_syscall
fbdev: Kill Atari vblank cursor blinking
m68k: zorro - Use %pR to print resources
m68k: dio - Kill resource_size_t format warnings
m68k: dmasound - Kill warn_unused_result warnings
m68k: zorro - Kill warn_unused_result warnings
m68k: dio - Kill warn_unused_result warnings
m68k: atafb - Kill warn_unused_result warnings
m68k: amiserial - Kill warn_unused_result warnings
m68k: ser_a2232 - Kill warn_unused_result warnings
m68k: vme_scc - Kill warn_unused_result warnings
m68k: sun3 core - Kill warn_unused_result warnings
m68k: mvme147 core - Kill warn_unused_result warnings
m68k: mac core - Kill warn_unused_result warnings
m68k: hp300 core - Kill warn_unused_result warnings
m68k: atari core - Kill warn_unused_result warnings
m68k: apollo core - Kill warn_unused_result warnings
m68k: amiga core - Kill warn_unused_result warnings
m68k: Kill several external declarations in source files
...
Diffstat (limited to 'arch/m68k/sun3x')
-rw-r--r-- | arch/m68k/sun3x/config.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c index 2b1ca2db070..fc599fad4a5 100644 --- a/arch/m68k/sun3x/config.c +++ b/arch/m68k/sun3x/config.c @@ -23,7 +23,6 @@ #include "time.h" volatile char *clock_va; -extern volatile unsigned char *sun3_intreg; extern void sun3_get_model(char *model); |