tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha

Pull alpha fixes from Matt Turner:
"My alpha tree is back up (after taking quite some time to get my GPG
key signed). It contains just some simple fixes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
alpha: silence 'const' warning in sys_marvel.c
alpha: include module.h to fix modpost on Tsunami
alpha: properly define get/set_rtc_time on Marvel/SMP
alpha: VGA_HOSE depends on VGA_CONSOLE

Linus Torvalds 03cb00b3 49a5f3cf

options
unified split
Changed files
+5 -8
arch
alpha
Kconfig
include
asm
rtc.h
kernel
core_tsunami.c
sys_marvel.c
+1 -1
arch/alpha/Kconfig
··· 477 477 478 478 config VGA_HOSE 479 479 bool 480 - depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL || ALPHA_TSUNAMI 480 + depends on VGA_CONSOLE && (ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL || ALPHA_TSUNAMI) 481 481 default y 482 482 help 483 483 Support VGA on an arbitrary hose; needed for several platforms
+2 -6
arch/alpha/include/asm/rtc.h
··· 1 1 #ifndef _ALPHA_RTC_H 2 2 #define _ALPHA_RTC_H 3 3 4 - #if defined(CONFIG_ALPHA_GENERIC) 4 + #if defined(CONFIG_ALPHA_MARVEL) && defined(CONFIG_SMP) \ 5 + || defined(CONFIG_ALPHA_GENERIC) 5 6 # define get_rtc_time alpha_mv.rtc_get_time 6 7 # define set_rtc_time alpha_mv.rtc_set_time 7 - #else 8 - # if defined(CONFIG_ALPHA_MARVEL) && defined(CONFIG_SMP) 9 - # define get_rtc_time marvel_get_rtc_time 10 - # define set_rtc_time marvel_set_rtc_time 11 - # endif 12 8 #endif 13 9 14 10 #include <asm-generic/rtc.h>
+1
arch/alpha/kernel/core_tsunami.c
··· 11 11 #include <asm/core_tsunami.h> 12 12 #undef __EXTERN_INLINE 13 13 14 + #include <linux/module.h> 14 15 #include <linux/types.h> 15 16 #include <linux/pci.h> 16 17 #include <linux/sched.h>
+1 -1
arch/alpha/kernel/sys_marvel.c
··· 317 317 } 318 318 319 319 static int 320 - marvel_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 320 + marvel_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 321 321 { 322 322 struct pci_controller *hose = dev->sysdata; 323 323 struct io7_port *io7_port = hose->sysdata;