diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 12:54:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 12:54:07 -0800 |
| commit | 541ef5cbb8e68189d47272cea52a69abc30259bc (patch) | |
| tree | 09c871320e6918ebb9b642a632971b364684d8a3 /arch/m68k/mac/config.c | |
| parent | 0191b625ca5a46206d2fb862bb08f36f2fcb3b31 (diff) | |
| parent | aa6eeeef78263e9891185c6cfaaf64808460a54a (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:
m68k: use the new byteorder headers
fbcon: Protect free_irq() by MACH_IS_ATARI check
fbcon: remove broken mac vbl handler
m68k: fix trigraph ignored warning in setox.S
macfb annotations and compiler warning fix
m68k: mac baboon interrupt enable/disable
m68k: machw.h cleanup
m68k: Mac via cleanup and commentry
m68k: Reinstate mac rtc
Diffstat (limited to 'arch/m68k/mac/config.c')
| -rw-r--r-- | arch/m68k/mac/config.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index c45e18449f3..8819b97be32 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -162,10 +162,7 @@ void __init config_mac(void) mach_init_IRQ = mac_init_IRQ; mach_get_model = mac_get_model; mach_gettimeoffset = mac_gettimeoffset; -#warning move to adb/via init -#if 0 mach_hwclk = mac_hwclk; -#endif mach_set_clock_mmss = mac_set_clock_mmss; mach_reset = mac_reset; mach_halt = mac_poweroff; |