X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=Documentation%2Fpnp.txt;h=481faf515d5360e608b6f4541ef03f759612bc4f;hb=9ac68d379e73e469b62149ee2dcc19547d3d992c;hp=9ff966bf76e65be0fc6281d879d673ce0f861143;hpb=84eb8d0608af1576175307ed8fb3c8fde329e579;p=linux-2.6-omap-h63xx.git

diff --git a/Documentation/pnp.txt b/Documentation/pnp.txt
index 9ff966bf76e..481faf515d5 100644
--- 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:
 
@@ -184,7 +184,7 @@ static const struct pnp_id pnp_dev_table[] = {
 Please note that the character 'X' can be used as a wild card in the function
 portion (last four characters).
 ex:
-	/* Unkown PnP modems */
+	/* Unknown PnP modems */
 	{	"PNPCXXX",		UNKNOWN_DEV	},
 
 Supported PnP card IDs can optionally be defined.