From 879c29b3b4d4a97f159e0cf9f5aff205567b36fb Mon Sep 17 00:00:00 2001 From: Milko Krachounov Date: Sat, 19 May 2007 01:18:03 +0200 Subject: [PATCH] --- yaml --- r: 58759 b: refs/heads/master c: 7de064ebc67d9baf6c933d3a7046feb9b4eced05 h: refs/heads/master i: 58757: 27420cd79f706065df4bacb06e27fac86496c132 58755: d89a01bb855baf0330d5b9b49ceda4ba50615706 58751: 665003acf30cc0a7dc2c86c42bd0217c46317b11 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci.c | 8 ++++++++ trunk/include/linux/pci_ids.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 99a4927a9781..b8d5630f1084 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98ccf14909ba02a41c5925b0b2c92aeeef23d3b9 +refs/heads/master: 7de064ebc67d9baf6c933d3a7046feb9b4eced05 diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c index a359efdd77eb..5e9a6ce83559 100644 --- a/trunk/drivers/mmc/host/sdhci.c +++ b/trunk/drivers/mmc/host/sdhci.c @@ -70,6 +70,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = { .driver_data = SDHCI_QUIRK_SINGLE_POWER_WRITE, }, + { + .vendor = PCI_VENDOR_ID_ENE, + .device = PCI_DEVICE_ID_ENE_CB712_SD_2, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .driver_data = SDHCI_QUIRK_SINGLE_POWER_WRITE, + }, + { /* Generic SD host controller */ PCI_DEVICE_CLASS((PCI_CLASS_SYSTEM_SDHCI << 8), 0xFFFF00) }, diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 5b1c9994f89a..75c4d4d06892 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -2000,6 +2000,7 @@ #define PCI_VENDOR_ID_ENE 0x1524 #define PCI_DEVICE_ID_ENE_CB712_SD 0x0550 +#define PCI_DEVICE_ID_ENE_CB712_SD_2 0x0551 #define PCI_DEVICE_ID_ENE_1211 0x1211 #define PCI_DEVICE_ID_ENE_1225 0x1225 #define PCI_DEVICE_ID_ENE_1410 0x1410