From 29fc3d2a665a2639d5bfeb11437e72f1f9fb17ab Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 1 Nov 2005 21:28:53 -0800
Subject: [PATCH] --- yaml --- r: 12082 b: refs/heads/master c:
 fca324e79fa30d4e64ac15554601a86392999ae6 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/i386/pci/fixup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d19721c94c5d..4f32aed9941a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f28570185f98bfa83f775756ced79e9f22b6d93
+refs/heads/master: fca324e79fa30d4e64ac15554601a86392999ae6
diff --git a/trunk/arch/i386/pci/fixup.c b/trunk/arch/i386/pci/fixup.c
index 330fd2b68075..3984226a8b98 100644
--- a/trunk/arch/i386/pci/fixup.c
+++ b/trunk/arch/i386/pci/fixup.c
@@ -398,7 +398,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video);
  */
 static u16 toshiba_line_size;
 
-static struct dmi_system_id __devinit toshiba_ohci1394_dmi_table[] = {
+static struct dmi_system_id __devinitdata toshiba_ohci1394_dmi_table[] = {
 	{
 		.ident = "Toshiba PS5 based laptop",
 		.matches = {