Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-drm-fsl-dcu.git] / Documentation / pnp.txt

diff --git a/Documentation/pnp.txt b/Documentation/pnp.txt
index 28037aa1846c89bbf8082007b5e10e470000ac94..481faf515d5360e608b6f4541ef03f759612bc4f 100644 (file)
--- a/Documentation/pnp.txt
+++ b/Documentation/pnp.txt
@@ -140,7 +140,7 @@ Plug and Play but it is planned to be in the near future.
 Requirements for a Linux PnP protocol:
 1.) the protocol must use EISA IDs
 2.) the protocol must inform the PnP Layer of a devices current configuration
-- the ability to set resources is optional but prefered.
+- the ability to set resources is optional but preferred.
 
 The following are PnP protocol related functions: