From 24721c2f17f844fc0cb98748332fdc3384f6a8dd Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:22:01 -0500
Subject: [PATCH] --- yaml --- r: 338113 b: refs/heads/master c:
 abe118b48f6ba7e28bd97c84eccb4484a2441732 h: refs/heads/master i:   338111:
 a13cce91842f28025d7f2513d8be52fe62969335 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/sm7xxfb/sm7xxfb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 69d5602c26e4..5ebbf7632896 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cd3a48ffbb05f2d41bef61c0681fe44eeaabb2e
+refs/heads/master: abe118b48f6ba7e28bd97c84eccb4484a2441732
diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
index 5272ba94a790..3c0ba60ec4f2 100644
--- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -768,7 +768,7 @@ static inline void sm7xx_init_hw(void)
 	outb_p(0x11, 0x3c5);
 }
 
-static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
+static int smtcfb_pci_probe(struct pci_dev *pdev,
 				   const struct pci_device_id *ent)
 {
 	struct smtcfb_info *sfb;