viafb: fix PCI table

viafb: fix PCI table

This patch fixes an oddity in the device table where the P4M890 ID was
assigned with the enumeration value of CN700 which itself was missing.
This is a regression introduced by
	"viafb: make viafb a first-class citizen using pci_driver"

While at it reorder the table to reflect the order of the  enumeration
values.

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Harald Welte <laforge@gnumonks.org>

diff --git a/drivers/video/via/via-core.c b/drivers/video/via/via-core.c
index e8cfe83..4afa3c5 100644 (file)
--- a/drivers/video/via/via-core.c
+++ b/drivers/video/via/via-core.c
@@ -613,22 +613,24 @@ static void __devexit via_pci_remove(struct pci_dev *pdev)
 static struct pci_device_id via_pci_table[] __devinitdata = {
        { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CLE266_DID),
          .driver_data = UNICHROME_CLE266 },
-       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_PM800_DID),
-         .driver_data = UNICHROME_PM800 },
        { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K400_DID),
          .driver_data = UNICHROME_K400 },
        { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K800_DID),
          .driver_data = UNICHROME_K800 },
-       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_P4M890_DID),
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_PM800_DID),
+         .driver_data = UNICHROME_PM800 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CN700_DID),
          .driver_data = UNICHROME_CN700 },
-       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K8M890_DID),
-         .driver_data = UNICHROME_K8M890 },
        { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CX700_DID),
          .driver_data = UNICHROME_CX700 },
-       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_P4M900_DID),
-         .driver_data = UNICHROME_P4M900 },
        { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_CN750_DID),
          .driver_data = UNICHROME_CN750 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_K8M890_DID),
+         .driver_data = UNICHROME_K8M890 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_P4M890_DID),
+         .driver_data = UNICHROME_P4M890 },
+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_P4M900_DID),
+         .driver_data = UNICHROME_P4M900 },
        { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_VX800_DID),
          .driver_data = UNICHROME_VX800 },
        { PCI_DEVICE(PCI_VENDOR_ID_VIA, UNICHROME_VX855_DID),