aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2015-05-15 11:10:08 +0200
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-05-15 17:59:22 +0200
commit633e827f1630b1d93ee11f8667c01712767389b0 (patch)
tree7b58daa0a896966855ace76e9cc3afceb63d1a80
parent9d45d6975ccdae7253c75259e1885b68186ce83d (diff)
downloadcoreboot-633e827f1630b1d93ee11f8667c01712767389b0.tar.gz
coreboot-633e827f1630b1d93ee11f8667c01712767389b0.tar.xz
coreboot-633e827f1630b1d93ee11f8667c01712767389b0.zip
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 <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/10211 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--src/drivers/ricoh/Makefile.inc1
-rw-r--r--src/drivers/ricoh/rce822/rce822.c7
2 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/ricoh/Makefile.inc b/src/drivers/ricoh/Makefile.inc
new file mode 100644
index 000000000..baa15ac4d
--- /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 2383f4b02..6a5c861af 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,
};