[SPARC]: Merge asm-sparc{,64}/bpp.h

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/asm-sparc/bpp.h b/include/asm-sparc/bpp.h
index 3578ac1..31f515e 100644 (file)
--- a/include/asm-sparc/bpp.h
+++ b/include/asm-sparc/bpp.h
@@ -17,7 +17,7 @@
  * with compliant or compatible devices. It will use whatever features
  * the device supports, prefering those that are typically faster.
  *
- * When the device is opened, it is left in COMPATABILITY mode, and
+ * When the device is opened, it is left in COMPATIBILITY mode, and
  * writes work like any printer device. The driver only attempt to
  * negotiate 1284 modes when needed so that plugs can be pulled,
  * switch boxes switched, etc., without disrupting things. It will

diff --cc include/asm-sparc64/bpp.h
Simple merge