diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-18 01:15:17 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-18 01:15:17 +0200 |
| commit | 11634bd6682d5979fa10fdc01cd74577827377bd (patch) | |
| tree | 22e3a3e7439ba30b15498113d24017b89e58cd39 /Documentation/DocBook/gadget.tmpl | |
| parent | ACPI / documentation: Remove reference to acpi_platform_device_ids from enume... (diff) | |
| parent | ACPI / video: Add use_native_backlight quirk for HP ProBook 4540s (diff) | |
| download | linux-11634bd6682d5979fa10fdc01cd74577827377bd.tar.xz linux-11634bd6682d5979fa10fdc01cd74577827377bd.zip | |
Merge branches 'acpi-scan' and 'acpi-video'
* acpi-scan:
ACPI / documentation: Remove reference to acpi_platform_device_ids from enumeration.txt
* acpi-video:
ACPI / video: Add use_native_backlight quirk for HP ProBook 4540s
Revert "ACPI / video: change acpi-video brightness_switch_enabled default to 0"
Diffstat (limited to 'Documentation/DocBook/gadget.tmpl')
| -rw-r--r-- | Documentation/DocBook/gadget.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/gadget.tmpl b/Documentation/DocBook/gadget.tmpl index 4017f147ba2f..2c425d70f7e2 100644 --- a/Documentation/DocBook/gadget.tmpl +++ b/Documentation/DocBook/gadget.tmpl @@ -708,7 +708,7 @@ hardware level details could be very different. <para>Systems need specialized hardware support to implement OTG, notably including a special <emphasis>Mini-AB</emphasis> jack -and associated transciever to support <emphasis>Dual-Role</emphasis> +and associated transceiver to support <emphasis>Dual-Role</emphasis> operation: they can act either as a host, using the standard Linux-USB host side driver stack, |