projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
[powerpc.git]
/
arch
/
alpha
/
kernel
/
sys_sio.c
diff --git
a/arch/alpha/kernel/sys_sio.c
b/arch/alpha/kernel/sys_sio.c
index
131a2d9
..
14b5a75
100644
(file)
--- a/
arch/alpha/kernel/sys_sio.c
+++ b/
arch/alpha/kernel/sys_sio.c
@@
-10,14
+10,13
@@
* Kenetics's Platform 2000, Avanti (AlphaStation), XL, and AlphaBook1.
*/
* Kenetics's Platform 2000, Avanti (AlphaStation), XL, and AlphaBook1.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/pci.h>
#include <linux/init.h>
-#include <linux/
tty
.h>
+#include <linux/
screen_info
.h>
#include <asm/compiler.h>
#include <asm/ptrace.h>
#include <asm/compiler.h>
#include <asm/ptrace.h>
@@
-85,12
+84,16
@@
alphabook1_init_arch(void)
static void __init
sio_pci_route(void)
{
static void __init
sio_pci_route(void)
{
-#if defined(ALPHA_RESTORE_SRM_SETUP)
- /* First, read and save the original setting. */
+ unsigned int orig_route_tab;
+
+ /* First, ALWAYS read and print the original setting. */
pci_bus_read_config_dword(pci_isa_hose->bus, PCI_DEVFN(7, 0), 0x60,
pci_bus_read_config_dword(pci_isa_hose->bus, PCI_DEVFN(7, 0), 0x60,
- &
saved_config.
orig_route_tab);
+ &orig_route_tab);
printk("%s: PIRQ original 0x%x new 0x%x\n", __FUNCTION__,
printk("%s: PIRQ original 0x%x new 0x%x\n", __FUNCTION__,
- saved_config.orig_route_tab, alpha_mv.sys.sio.route_tab);
+ orig_route_tab, alpha_mv.sys.sio.route_tab);
+
+#if defined(ALPHA_RESTORE_SRM_SETUP)
+ saved_config.orig_route_tab = orig_route_tab;
#endif
/* Now override with desired setting. */
#endif
/* Now override with desired setting. */
@@
-335,7
+338,7
@@
struct alpha_machine_vector avanti_mv __initmv = {
.pci_swizzle = common_swizzle,
.sys = { .sio = {
.pci_swizzle = common_swizzle,
.sys = { .sio = {
- .route_tab = 0x0b0a0
e0f,
+ .route_tab = 0x0b0a0
50f, /* leave 14 for IDE, 9 for SND */
}}
};
ALIAS_MV(avanti)
}}
};
ALIAS_MV(avanti)