From 7adb2d838de2b6d5a54fb60cd69a564d0c8c2116 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 20 May 2010 10:39:38 +0200
Subject: [PATCH] --- yaml --- r: 205570 b: refs/heads/master c:
 15f0beb16937acef2bbfd1d7541612c2e7b0d37c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 67e2b2381a88..33576cebe6e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cc544df9373c7947be35f30ddee9725710994b0
+refs/heads/master: 15f0beb16937acef2bbfd1d7541612c2e7b0d37c
diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
index c21731a12ca7..4f6f64031f8f 100644
--- a/trunk/drivers/staging/hv/vmbus_drv.c
+++ b/trunk/drivers/staging/hv/vmbus_drv.c
@@ -1025,7 +1025,7 @@ static void __exit vmbus_exit(void)
  * installed and/or configured.  We don't do anything else with the table, but
  * it needs to be present.
  */
-const static struct pci_device_id microsoft_hv_pci_table[] = {
+static const struct pci_device_id microsoft_hv_pci_table[] = {
 	{ PCI_DEVICE(0x1414, 0x5353) },	/* VGA compatible controller */
 	{ 0 }
 };