git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
pci
/
pci.c
diff --git
a/drivers/pci/pci.c
b/drivers/pci/pci.c
index
56098b3
..
5f10c23
100644
(file)
--- a/
drivers/pci/pci.c
+++ b/
drivers/pci/pci.c
@@
-3271,11
+3271,11
@@
void __init pci_register_set_vga_state(arch_set_vga_state_t func)
}
static int pci_set_vga_state_arch(struct pci_dev *dev, bool decode,
}
static int pci_set_vga_state_arch(struct pci_dev *dev, bool decode,
- unsigned int command_bits,
bool change_bridge
)
+ unsigned int command_bits,
u32 flags
)
{
if (arch_set_vga_state)
return arch_set_vga_state(dev, decode, command_bits,
{
if (arch_set_vga_state)
return arch_set_vga_state(dev, decode, command_bits,
-
change_bridge
);
+
flags
);
return 0;
}
return 0;
}