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

Commit 1c402c8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: add io delay quirk for Presario F700
parents 45d866e1 e6a5652f

arch/x86/kernel/io_delay.c

+8 −0
Original line number Diff line number Diff line
@@ -92,6 +92,14 @@ static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "30BF")

		}

	},

	{

		.callback	= dmi_io_delay_0xed_port,

		.ident		= "Presario F700",

		.matches	= {

			DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),

			DMI_MATCH(DMI_BOARD_NAME, "30D3")

		}

	},

	{ }

};