---

yaml --- r: 185507 b: refs/heads/master c: a6678b2 h: refs/heads/master i: 185505: 662ec43 185503: fadc56f v: v3
git-mirror · Feb 25, 2010 · 38ae178 · 38ae178
1 parent b7f6d3e
commit 38ae178
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b42861f40f5ea3261d9fa1d5533496bf1fc812cf
+refs/heads/master: a6678b2ace023912000119a14eeb39a56050bc7c
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -5037,7 +5037,7 @@ read_dcb_i2c_entry(struct drm_device *dev, int dcb_version, uint8_t *i2ctable, i
 static struct dcb_gpio_entry *
 new_gpio_entry(struct nvbios *bios)
 {
-	struct parsed_dcb_gpio *gpio = &bios->bdcb.gpio;
+	struct dcb_gpio_table *gpio = &bios->bdcb.gpio;
 
 	return &gpio->entry[gpio->entries++];
 }

diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bios.h b/trunk/drivers/gpu/drm/nouveau/nouveau_bios.h
@@ -94,7 +94,7 @@ struct dcb_gpio_entry {
 	bool invert;
 };
 
-struct parsed_dcb_gpio {
+struct dcb_gpio_table {
 	int entries;
 	struct dcb_gpio_entry entry[DCB_MAX_NUM_GPIO_ENTRIES];
 };
@@ -120,7 +120,7 @@ struct bios_parsed_dcb {
 	uint8_t i2c_default_indices;
 
 	uint16_t gpio_table_ptr;
-	struct parsed_dcb_gpio gpio;
+	struct dcb_gpio_table gpio;
 	uint16_t connector_table_ptr;
 	struct dcb_connector_table connector;
 };