Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07b08a16 authored by Jeff Garzik's avatar Jeff Garzik Committed by Jeff Garzik
Browse files

Automatic merge of... 

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
parents 462cee29 254feb88

arch/i386/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1163,7 +1163,7 @@ config PCI_DIRECT 


config PCI_MMCONFIG

	bool

	depends on PCI && (PCI_GOMMCONFIG || (PCI_GOANY && ACPI))

	depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)

	select ACPI_BOOT

	default y

arch/i386/pci/irq.c

+0 −5
Original line number Diff line number Diff line
@@ -1029,7 +1029,6 @@ void pcibios_penalize_isa_irq(int irq) 
static int pirq_enable_irq(struct pci_dev *dev)

{

	u8 pin;

	extern int via_interrupt_line_quirk;

	struct pci_dev *temp_dev;



	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
@@ -1084,10 +1083,6 @@ static int pirq_enable_irq(struct pci_dev *dev) 
		printk(KERN_WARNING "PCI: No IRQ known for interrupt pin %c of device %s.%s\n",

		       'A' + pin, pci_name(dev), msg);

	}

	/* VIA bridges use interrupt line for apic/pci steering across

	   the V-Link */

	else if (via_interrupt_line_quirk)

		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq & 15);

	return 0;

}

arch/x86_64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ config PCI_DIRECT 


config PCI_MMCONFIG

	bool "Support mmconfig PCI config space access"

	depends on PCI

	depends on PCI && ACPI

	select ACPI_BOOT



config UNORDERED_IO

drivers/acpi/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -40,13 +40,12 @@ config ACPI 
	  available at:

	  <http://www.acpi.info>



if ACPI



config ACPI_BOOT

	bool

	depends on ACPI || X86_HT

	default y



if ACPI



config ACPI_INTERPRETER

	bool

	depends on !IA64_SGI_SN

drivers/acpi/pci_irq.c

+0 −4
Original line number Diff line number Diff line
@@ -391,7 +391,6 @@ acpi_pci_irq_enable ( 
	u8			pin = 0;

	int			edge_level = ACPI_LEVEL_SENSITIVE;

	int			active_high_low = ACPI_ACTIVE_LOW;

	extern int		via_interrupt_line_quirk;

	char			*link = NULL;



	ACPI_FUNCTION_TRACE("acpi_pci_irq_enable");
@@ -444,9 +443,6 @@ acpi_pci_irq_enable ( 
		}

 	}



	if (via_interrupt_line_quirk)

		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq & 15);



	dev->irq = acpi_register_gsi(irq, edge_level, active_high_low);



	printk(KERN_INFO PREFIX "PCI Interrupt %s[%c] -> ",