mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-22 04:15:02 +00:00
[PATCH] x86: cyrix code CONFIG_PCI fix / add __initdata
PCI code was outside of CONFIG_PCI, add __initdata at cyrix_55x0 (since accessed within __init function only). Signed-off-by: Andreas Mohr <andi@lisas.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
acae9d3243
commit
cefc01130b
1 changed files with 5 additions and 4 deletions
|
@ -184,7 +184,7 @@ static void __init geode_configure(void)
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_PCI
|
#ifdef CONFIG_PCI
|
||||||
static struct pci_device_id cyrix_55x0[] = {
|
static struct pci_device_id __initdata cyrix_55x0[] = {
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510) },
|
{ PCI_DEVICE(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510) },
|
||||||
{ PCI_DEVICE(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520) },
|
{ PCI_DEVICE(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520) },
|
||||||
{ },
|
{ },
|
||||||
|
@ -272,14 +272,15 @@ static void __init init_cyrix(struct cpuinfo_x86 *c)
|
||||||
|
|
||||||
printk(KERN_INFO "Working around Cyrix MediaGX virtual DMA bugs.\n");
|
printk(KERN_INFO "Working around Cyrix MediaGX virtual DMA bugs.\n");
|
||||||
isa_dma_bridge_buggy = 2;
|
isa_dma_bridge_buggy = 2;
|
||||||
#endif
|
|
||||||
c->x86_cache_size=16; /* Yep 16K integrated cache thats it */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The 5510/5520 companion chips have a funky PIT.
|
* The 5510/5520 companion chips have a funky PIT.
|
||||||
*/
|
*/
|
||||||
if (pci_dev_present(cyrix_55x0))
|
if (pci_dev_present(cyrix_55x0))
|
||||||
pit_latch_buggy = 1;
|
pit_latch_buggy = 1;
|
||||||
|
#endif
|
||||||
|
c->x86_cache_size=16; /* Yep 16K integrated cache thats it */
|
||||||
|
|
||||||
/* GXm supports extended cpuid levels 'ala' AMD */
|
/* GXm supports extended cpuid levels 'ala' AMD */
|
||||||
if (c->cpuid_level == 2) {
|
if (c->cpuid_level == 2) {
|
||||||
|
|
Loading…
Reference in a new issue