aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJohannes Pointner <johannes.pointner@gmail.com>2014-06-27 19:53:53 +0200
committerGuenter Roeck <linux@roeck-us.net>2014-08-04 07:01:34 -0700
commit3ef0bb6f769bc61af0ec073cbf49db6598bdefc0 (patch)
tree1fea945c09a8bf4d9502aba576664b13264c79f0 /Documentation
parenthwmon: (hih6130) Convert to devm_hwmon_device_register_with_groups (diff)
downloadlinux-dev-3ef0bb6f769bc61af0ec073cbf49db6598bdefc0.tar.xz
linux-dev-3ef0bb6f769bc61af0ec073cbf49db6598bdefc0.zip
devicetree: Add vendor prefix "epcos" to vendor-prefixes.txt
This patch adds the vendor prefix for "epcos" to the vendor-prefixes. Signed-off-by: Johannes Pointner <johannes.pointner@gmail.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/vendor-prefixes.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 46a311e728a8..97c9c06132c4 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -42,6 +42,7 @@ dmo Data Modul AG
ebv EBV Elektronik
edt Emerging Display Technologies
emmicro EM Microelectronic
+epcos EPCOS AG
epfl Ecole Polytechnique Fédérale de Lausanne
epson Seiko Epson Corp.
est ESTeem Wireless Modems