From 633e827f1630b1d93ee11f8667c01712767389b0 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 15 May 2015 11:10:08 +0200 Subject: x230: Fix ricoh driver. Inclusion of ricoh driver was lost in 1d7b9de3504e90f0886fccec3a1f8a783fd4cc58. So the relevant code wasn't even compiled. Fix copy-paste mistakes without significance while on it as well. Change-Id: Ie548cb43f986f147658fc9c67963f8a055250598 Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/10211 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/drivers/ricoh/Makefile.inc | 1 + src/drivers/ricoh/rce822/rce822.c | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 src/drivers/ricoh/Makefile.inc (limited to 'src/drivers/ricoh') diff --git a/src/drivers/ricoh/Makefile.inc b/src/drivers/ricoh/Makefile.inc new file mode 100644 index 0000000000..baa15ac4d7 --- /dev/null +++ b/src/drivers/ricoh/Makefile.inc @@ -0,0 +1 @@ +subdirs-y += rce822 diff --git a/src/drivers/ricoh/rce822/rce822.c b/src/drivers/ricoh/rce822/rce822.c index 2383f4b026..6a5c861afd 100644 --- a/src/drivers/ricoh/rce822/rce822.c +++ b/src/drivers/ricoh/rce822/rce822.c @@ -46,7 +46,6 @@ static void rce822_init(struct device *dev) static void rce822_set_subsystem(device_t dev, unsigned vendor, unsigned device) { - if (!vendor || !device) { pci_write_config32(dev, 0xac, pci_read_config32(dev, PCI_VENDOR_ID)); @@ -60,7 +59,7 @@ static struct pci_operations lops_pci = { .set_subsystem = &rce822_set_subsystem, }; -static struct device_operations usb_ehci_ops = { +static struct device_operations rce822_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, @@ -72,8 +71,8 @@ static struct device_operations usb_ehci_ops = { static const unsigned short pci_device_ids[] = { 0xe822, 0xe823, 0 }; -static const struct pci_driver pch_usb_ehci __pci_driver = { - .ops = &usb_ehci_ops, +static const struct pci_driver rce822 __pci_driver = { + .ops = &rce822_ops, .vendor = PCI_VENDOR_ID_RICOH, .devices = pci_device_ids, }; -- cgit v1.2.3