mirror of
https://github.com/torvalds/linux.git
synced 2024-10-30 00:32:38 +00:00
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
This commit is contained in:
commit
03cb00b3c7
@ -477,7 +477,7 @@ config ALPHA_BROKEN_IRQ_MASK
|
|||||||
|
|
||||||
config VGA_HOSE
|
config VGA_HOSE
|
||||||
bool
|
bool
|
||||||
depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL || ALPHA_TSUNAMI
|
depends on VGA_CONSOLE && (ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL || ALPHA_TSUNAMI)
|
||||||
default y
|
default y
|
||||||
help
|
help
|
||||||
Support VGA on an arbitrary hose; needed for several platforms
|
Support VGA on an arbitrary hose; needed for several platforms
|
||||||
|
@ -1,14 +1,10 @@
|
|||||||
#ifndef _ALPHA_RTC_H
|
#ifndef _ALPHA_RTC_H
|
||||||
#define _ALPHA_RTC_H
|
#define _ALPHA_RTC_H
|
||||||
|
|
||||||
#if defined(CONFIG_ALPHA_GENERIC)
|
#if defined(CONFIG_ALPHA_MARVEL) && defined(CONFIG_SMP) \
|
||||||
|
|| defined(CONFIG_ALPHA_GENERIC)
|
||||||
# define get_rtc_time alpha_mv.rtc_get_time
|
# define get_rtc_time alpha_mv.rtc_get_time
|
||||||
# define set_rtc_time alpha_mv.rtc_set_time
|
# define set_rtc_time alpha_mv.rtc_set_time
|
||||||
#else
|
|
||||||
# if defined(CONFIG_ALPHA_MARVEL) && defined(CONFIG_SMP)
|
|
||||||
# define get_rtc_time marvel_get_rtc_time
|
|
||||||
# define set_rtc_time marvel_set_rtc_time
|
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <asm-generic/rtc.h>
|
#include <asm-generic/rtc.h>
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
#include <asm/core_tsunami.h>
|
#include <asm/core_tsunami.h>
|
||||||
#undef __EXTERN_INLINE
|
#undef __EXTERN_INLINE
|
||||||
|
|
||||||
|
#include <linux/module.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
|
@ -317,7 +317,7 @@ marvel_init_irq(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
marvel_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
marvel_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
{
|
{
|
||||||
struct pci_controller *hose = dev->sysdata;
|
struct pci_controller *hose = dev->sysdata;
|
||||||
struct io7_port *io7_port = hose->sysdata;
|
struct io7_port *io7_port = hose->sysdata;
|
||||||
|
Loading…
Reference in New Issue
Block a user