[coreboot-gerrit] Change in coreboot[master]: azalia: rename TYPE_OTHER to not conflict with smbios'

[Patrick Georgi (Code Review)]

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43135 )

Change subject: azalia: rename TYPE_OTHER to not conflict with smbios'
......................................................................

azalia: rename TYPE_OTHER to not conflict with smbios'

Change-Id: Ic66f7c919a71cb53773d5056e5f756cd6faf4909
Signed-off-by: Patrick Georgi 
---
M src/include/device/azalia_device.h
M src/mainboard/prodrive/hermes/hda_verb.c
2 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/43135/1

diff --git a/src/include/device/azalia_device.h b/src/include/device/azalia_device.h
index 9026091..f2a2cb8 100644
--- a/src/include/device/azalia_device.h
+++ b/src/include/device/azalia_device.h
@@ -39,7 +39,7 @@
 };

enum azalia_pin_type {
-	TYPE_UNKNOWN = 0,
+	PIN_TYPE_UNKNOWN = 0,
    STEREO_MONO_1_8,
    STEREO_MONO_1_4,
    ATAPI,
@@ -51,7 +51,7 @@
    XLR,
    RJ_11,
    COMBINATION,
-	TYPE_OTHER = 0xf
+	PIN_TYPE_OTHER = 0xf
 };

enum azalia_pin_device {
diff --git a/src/mainboard/prodrive/hermes/hda_verb.c b/src/mainboard/prodrive/hermes/hda_verb.c
index 59b8aa6..260b9a5 100644
--- a/src/mainboard/prodrive/hermes/hda_verb.c
+++ b/src/mainboard/prodrive/hermes/hda_verb.c
@@ -87,7 +87,7 @@
    	LOCATION_OTHER,
    	NA,
    	DEVICE_OTHER,
-		TYPE_OTHER,
+		PIN_TYPE_OTHER,
    	COLOR_OTHER,
    	true,
    	0,
@@ -99,7 +99,7 @@
    	LOCATION_OTHER,
    	NA,
    	DEVICE_OTHER,
-		TYPE_OTHER,
+		PIN_TYPE_OTHER,
    	COLOR_OTHER,
    	true,
    	0,