treewide: Fix typo compatability -> compatibility

Submitted by Laurent Pinchart on May 27, 2015, 12:05 p.m.

Details

Message ID 1432728342-32748-1-git-send-email-laurent.pinchart@ideasonboard.com
State New
Headers show

Commit Message

Laurent Pinchart May 27, 2015, 12:05 p.m.
Even though 'compatability' has a dedicated entry in the Wiktionary,
it's listed as 'Mispelling of compatibility'. Fix it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 arch/metag/include/asm/elf.h             | 2 +-
 arch/powerpc/kvm/book3s.c                | 2 +-
 arch/sparc/include/uapi/asm/pstate.h     | 2 +-
 drivers/gpu/drm/drm_atomic_helper.c      | 4 ++--
 drivers/media/dvb-frontends/au8522_dig.c | 2 +-
 drivers/net/wireless/ipw2x00/ipw2100.h   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

I can split this into one patch per subsystem, but that seems a bit overkill.
Can someone take it ?

Comments

Daniel Vetter May 27, 2015, 1:15 p.m.
On Wed, May 27, 2015 at 03:05:42PM +0300, Laurent Pinchart wrote:
> Even though 'compatability' has a dedicated entry in the Wiktionary,
> it's listed as 'Mispelling of compatibility'. Fix it.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  arch/metag/include/asm/elf.h             | 2 +-
>  arch/powerpc/kvm/book3s.c                | 2 +-
>  arch/sparc/include/uapi/asm/pstate.h     | 2 +-
>  drivers/gpu/drm/drm_atomic_helper.c      | 4 ++--
>  drivers/media/dvb-frontends/au8522_dig.c | 2 +-
>  drivers/net/wireless/ipw2x00/ipw2100.h   | 2 +-
>  6 files changed, 7 insertions(+), 7 deletions(-)
> 
> I can split this into one patch per subsystem, but that seems a bit overkill.
> Can someone take it ?

Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> for the atomic_helper.c
part.
-Daniel

> 
> diff --git a/arch/metag/include/asm/elf.h b/arch/metag/include/asm/elf.h
> index d2baf6961794..87b0cf1e0acb 100644
> --- a/arch/metag/include/asm/elf.h
> +++ b/arch/metag/include/asm/elf.h
> @@ -11,7 +11,7 @@
>  #define R_METAG_RELBRANCH                4
>  #define R_METAG_GETSETOFF                5
>  
> -/* Backward compatability */
> +/* Backward compatibility */
>  #define R_METAG_REG32OP1                 6
>  #define R_METAG_REG32OP2                 7
>  #define R_METAG_REG32OP3                 8
> diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
> index 453a8a47a467..cb14dd78a2e7 100644
> --- a/arch/powerpc/kvm/book3s.c
> +++ b/arch/powerpc/kvm/book3s.c
> @@ -901,7 +901,7 @@ int kvmppc_core_check_processor_compat(void)
>  {
>  	/*
>  	 * We always return 0 for book3s. We check
> -	 * for compatability while loading the HV
> +	 * for compatibility while loading the HV
>  	 * or PR module
>  	 */
>  	return 0;
> diff --git a/arch/sparc/include/uapi/asm/pstate.h b/arch/sparc/include/uapi/asm/pstate.h
> index 4b6b998afd99..cf832e14aa05 100644
> --- a/arch/sparc/include/uapi/asm/pstate.h
> +++ b/arch/sparc/include/uapi/asm/pstate.h
> @@ -88,7 +88,7 @@
>  #define VERS_MAXTL	_AC(0x000000000000ff00,UL) /* Max Trap Level.	*/
>  #define VERS_MAXWIN	_AC(0x000000000000001f,UL) /* Max RegWindow Idx.*/
>  
> -/* Compatability Feature Register (%asr26), SPARC-T4 and later  */
> +/* Compatibility Feature Register (%asr26), SPARC-T4 and later  */
>  #define CFR_AES		_AC(0x0000000000000001,UL) /* Supports AES opcodes     */
>  #define CFR_DES		_AC(0x0000000000000002,UL) /* Supports DES opcodes     */
>  #define CFR_KASUMI	_AC(0x0000000000000004,UL) /* Supports KASUMI opcodes  */
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index b82ef6262469..12c5b79b0e8f 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -751,7 +751,7 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state)
>   * This function shuts down all the outputs that need to be shut down and
>   * prepares them (if required) with the new mode.
>   *
> - * For compatability with legacy crtc helpers this should be called before
> + * For compatibility with legacy crtc helpers this should be called before
>   * drm_atomic_helper_commit_planes(), which is what the default commit function
>   * does. But drivers with different needs can group the modeset commits together
>   * and do the plane commits at the end. This is useful for drivers doing runtime
> @@ -776,7 +776,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_modeset_disables);
>   * This function enables all the outputs with the new configuration which had to
>   * be turned off for the update.
>   *
> - * For compatability with legacy crtc helpers this should be called after
> + * For compatibility with legacy crtc helpers this should be called after
>   * drm_atomic_helper_commit_planes(), which is what the default commit function
>   * does. But drivers with different needs can group the modeset commits together
>   * and do the plane commits at the end. This is useful for drivers doing runtime
> diff --git a/drivers/media/dvb-frontends/au8522_dig.c b/drivers/media/dvb-frontends/au8522_dig.c
> index 5d06c99b0e97..edadcc7eea6c 100644
> --- a/drivers/media/dvb-frontends/au8522_dig.c
> +++ b/drivers/media/dvb-frontends/au8522_dig.c
> @@ -922,7 +922,7 @@ module_param(debug, int, 0644);
>  MODULE_PARM_DESC(debug, "Enable verbose debug messages");
>  
>  module_param(zv_mode, int, 0644);
> -MODULE_PARM_DESC(zv_mode, "Turn on/off ZeeVee modulator compatability mode (default:on).\n"
> +MODULE_PARM_DESC(zv_mode, "Turn on/off ZeeVee modulator compatibility mode (default:on).\n"
>  	"\t\ton - modified AU8522 QAM256 initialization.\n"
>  	"\t\tProvides faster lock when using ZeeVee modulator based sources");
>  
> diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h
> index c6d78790cb0d..193947865efd 100644
> --- a/drivers/net/wireless/ipw2x00/ipw2100.h
> +++ b/drivers/net/wireless/ipw2x00/ipw2100.h
> @@ -746,7 +746,7 @@ struct ipw2100_priv {
>  #define IPW_REG_GPIO			IPW_REG_DOMAIN_0_OFFSET + 0x0030
>  #define IPW_REG_FW_TYPE                 IPW_REG_DOMAIN_1_OFFSET + 0x0188
>  #define IPW_REG_FW_VERSION 		IPW_REG_DOMAIN_1_OFFSET + 0x018C
> -#define IPW_REG_FW_COMPATABILITY_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x0190
> +#define IPW_REG_FW_COMPATIBILITY_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x0190
>  
>  #define IPW_REG_INDIRECT_ADDR_MASK	0x00FFFFFC
>  
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
David Miller May 27, 2015, 3:53 p.m.
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 27 May 2015 15:05:42 +0300

> Even though 'compatability' has a dedicated entry in the Wiktionary,
> it's listed as 'Mispelling of compatibility'. Fix it.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Acked-by: David S. Miller <davem@davemloft.net>
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexander Graf June 1, 2015, 11:38 a.m.
On 27.05.15 14:05, Laurent Pinchart wrote:
> Even though 'compatability' has a dedicated entry in the Wiktionary,
> it's listed as 'Mispelling of compatibility'. Fix it.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  arch/metag/include/asm/elf.h             | 2 +-


>  arch/powerpc/kvm/book3s.c                | 2 +-

Acked-by: Alexander Graf <agraf@suse.de>

for the PPC KVM bit.


Alex
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stanislav Yakovlev June 4, 2015, 11:53 a.m.
On 27 May 2015 at 16:05, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> Even though 'compatability' has a dedicated entry in the Wiktionary,
> it's listed as 'Mispelling of compatibility'. Fix it.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  drivers/net/wireless/ipw2x00/ipw2100.h   | 2 +-
>

Acked-by: Stanislav Yakovlev <stas.yakovlev@gmail.com>

for ipw2100 part.

Stanislav.
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mauro Carvalho Chehab June 9, 2015, 10:27 p.m.
Em Wed, 27 May 2015 15:05:42 +0300
Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:

> Even though 'compatability' has a dedicated entry in the Wiktionary,
> it's listed as 'Mispelling of compatibility'. Fix it.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Acked-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

> ---
>  arch/metag/include/asm/elf.h             | 2 +-
>  arch/powerpc/kvm/book3s.c                | 2 +-
>  arch/sparc/include/uapi/asm/pstate.h     | 2 +-
>  drivers/gpu/drm/drm_atomic_helper.c      | 4 ++--
>  drivers/media/dvb-frontends/au8522_dig.c | 2 +-
>  drivers/net/wireless/ipw2x00/ipw2100.h   | 2 +-
>  6 files changed, 7 insertions(+), 7 deletions(-)
> 
> I can split this into one patch per subsystem, but that seems a bit overkill.
> Can someone take it ?

Who? That's the problem with treewide patches ;) 

Perhaps you should re-submit it with the acks you got to akpm.

Regards,
Mauro

> 
> diff --git a/arch/metag/include/asm/elf.h b/arch/metag/include/asm/elf.h
> index d2baf6961794..87b0cf1e0acb 100644
> --- a/arch/metag/include/asm/elf.h
> +++ b/arch/metag/include/asm/elf.h
> @@ -11,7 +11,7 @@
>  #define R_METAG_RELBRANCH                4
>  #define R_METAG_GETSETOFF                5
>  
> -/* Backward compatability */
> +/* Backward compatibility */
>  #define R_METAG_REG32OP1                 6
>  #define R_METAG_REG32OP2                 7
>  #define R_METAG_REG32OP3                 8
> diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
> index 453a8a47a467..cb14dd78a2e7 100644
> --- a/arch/powerpc/kvm/book3s.c
> +++ b/arch/powerpc/kvm/book3s.c
> @@ -901,7 +901,7 @@ int kvmppc_core_check_processor_compat(void)
>  {
>  	/*
>  	 * We always return 0 for book3s. We check
> -	 * for compatability while loading the HV
> +	 * for compatibility while loading the HV
>  	 * or PR module
>  	 */
>  	return 0;
> diff --git a/arch/sparc/include/uapi/asm/pstate.h b/arch/sparc/include/uapi/asm/pstate.h
> index 4b6b998afd99..cf832e14aa05 100644
> --- a/arch/sparc/include/uapi/asm/pstate.h
> +++ b/arch/sparc/include/uapi/asm/pstate.h
> @@ -88,7 +88,7 @@
>  #define VERS_MAXTL	_AC(0x000000000000ff00,UL) /* Max Trap Level.	*/
>  #define VERS_MAXWIN	_AC(0x000000000000001f,UL) /* Max RegWindow Idx.*/
>  
> -/* Compatability Feature Register (%asr26), SPARC-T4 and later  */
> +/* Compatibility Feature Register (%asr26), SPARC-T4 and later  */
>  #define CFR_AES		_AC(0x0000000000000001,UL) /* Supports AES opcodes     */
>  #define CFR_DES		_AC(0x0000000000000002,UL) /* Supports DES opcodes     */
>  #define CFR_KASUMI	_AC(0x0000000000000004,UL) /* Supports KASUMI opcodes  */
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index b82ef6262469..12c5b79b0e8f 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -751,7 +751,7 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state)
>   * This function shuts down all the outputs that need to be shut down and
>   * prepares them (if required) with the new mode.
>   *
> - * For compatability with legacy crtc helpers this should be called before
> + * For compatibility with legacy crtc helpers this should be called before
>   * drm_atomic_helper_commit_planes(), which is what the default commit function
>   * does. But drivers with different needs can group the modeset commits together
>   * and do the plane commits at the end. This is useful for drivers doing runtime
> @@ -776,7 +776,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_modeset_disables);
>   * This function enables all the outputs with the new configuration which had to
>   * be turned off for the update.
>   *
> - * For compatability with legacy crtc helpers this should be called after
> + * For compatibility with legacy crtc helpers this should be called after
>   * drm_atomic_helper_commit_planes(), which is what the default commit function
>   * does. But drivers with different needs can group the modeset commits together
>   * and do the plane commits at the end. This is useful for drivers doing runtime
> diff --git a/drivers/media/dvb-frontends/au8522_dig.c b/drivers/media/dvb-frontends/au8522_dig.c
> index 5d06c99b0e97..edadcc7eea6c 100644
> --- a/drivers/media/dvb-frontends/au8522_dig.c
> +++ b/drivers/media/dvb-frontends/au8522_dig.c
> @@ -922,7 +922,7 @@ module_param(debug, int, 0644);
>  MODULE_PARM_DESC(debug, "Enable verbose debug messages");
>  
>  module_param(zv_mode, int, 0644);
> -MODULE_PARM_DESC(zv_mode, "Turn on/off ZeeVee modulator compatability mode (default:on).\n"
> +MODULE_PARM_DESC(zv_mode, "Turn on/off ZeeVee modulator compatibility mode (default:on).\n"
>  	"\t\ton - modified AU8522 QAM256 initialization.\n"
>  	"\t\tProvides faster lock when using ZeeVee modulator based sources");
>  
> diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h
> index c6d78790cb0d..193947865efd 100644
> --- a/drivers/net/wireless/ipw2x00/ipw2100.h
> +++ b/drivers/net/wireless/ipw2x00/ipw2100.h
> @@ -746,7 +746,7 @@ struct ipw2100_priv {
>  #define IPW_REG_GPIO			IPW_REG_DOMAIN_0_OFFSET + 0x0030
>  #define IPW_REG_FW_TYPE                 IPW_REG_DOMAIN_1_OFFSET + 0x0188
>  #define IPW_REG_FW_VERSION 		IPW_REG_DOMAIN_1_OFFSET + 0x018C
> -#define IPW_REG_FW_COMPATABILITY_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x0190
> +#define IPW_REG_FW_COMPATIBILITY_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x0190
>  
>  #define IPW_REG_INDIRECT_ADDR_MASK	0x00FFFFFC
>  
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Masanari Iida June 10, 2015, 4 a.m.
On Wed, Jun 10, 2015 at 7:27 AM, Mauro Carvalho Chehab
<mchehab@osg.samsung.com> wrote:
> Em Wed, 27 May 2015 15:05:42 +0300
> Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:
>
>> Even though 'compatability' has a dedicated entry in the Wiktionary,
>> it's listed as 'Mispelling of compatibility'. Fix it.
>>
>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> Acked-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
>
>> ---
>>  arch/metag/include/asm/elf.h             | 2 +-
>>  arch/powerpc/kvm/book3s.c                | 2 +-
>>  arch/sparc/include/uapi/asm/pstate.h     | 2 +-
>>  drivers/gpu/drm/drm_atomic_helper.c      | 4 ++--
>>  drivers/media/dvb-frontends/au8522_dig.c | 2 +-
>>  drivers/net/wireless/ipw2x00/ipw2100.h   | 2 +-
>>  6 files changed, 7 insertions(+), 7 deletions(-)
>>
>> I can split this into one patch per subsystem, but that seems a bit overkill.
>> Can someone take it ?
>
> Who? That's the problem with treewide patches ;)
>
> Perhaps you should re-submit it with the acks you got to akpm.
>
> Regards,
> Mauro
>
Laurent,
Please re-submit your patch to  trivial@kernel.org  with [trivial] in the title.

Ex.
[PATCH] [trivial]  treewide: Fix typo compatability -> compatibility

Regards,
Masanari
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Laurent Pinchart June 11, 2015, 4:23 a.m.
Hello,

On Wednesday 10 June 2015 13:00:20 Masanari Iida wrote:
> On Wed, Jun 10, 2015 at 7:27 AM, Mauro Carvalho Chehab wrote:
> > Em Wed, 27 May 2015 15:05:42 +0300
> > 
> > Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:
> >> Even though 'compatability' has a dedicated entry in the Wiktionary,
> >> it's listed as 'Mispelling of compatibility'. Fix it.
> >> 
> >> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > 
> > Acked-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
> > 
> >> ---
> >> 
> >>  arch/metag/include/asm/elf.h             | 2 +-
> >>  arch/powerpc/kvm/book3s.c                | 2 +-
> >>  arch/sparc/include/uapi/asm/pstate.h     | 2 +-
> >>  drivers/gpu/drm/drm_atomic_helper.c      | 4 ++--
> >>  drivers/media/dvb-frontends/au8522_dig.c | 2 +-
> >>  drivers/net/wireless/ipw2x00/ipw2100.h   | 2 +-
> >>  6 files changed, 7 insertions(+), 7 deletions(-)
> >> 
> >> I can split this into one patch per subsystem, but that seems a bit
> >> overkill. Can someone take it ?
> > 
> > Who? That's the problem with treewide patches ;)
> > 
> > Perhaps you should re-submit it with the acks you got to akpm.
> 
> Laurent,
> Please re-submit your patch to  trivial@kernel.org  with [trivial] in the
> title.
> 
> Ex.
> [PATCH] [trivial]  treewide: Fix typo compatability -> compatibility

Done, thank you.

Patch hide | download patch | download mbox

diff --git a/arch/metag/include/asm/elf.h b/arch/metag/include/asm/elf.h
index d2baf6961794..87b0cf1e0acb 100644
--- a/arch/metag/include/asm/elf.h
+++ b/arch/metag/include/asm/elf.h
@@ -11,7 +11,7 @@ 
 #define R_METAG_RELBRANCH                4
 #define R_METAG_GETSETOFF                5
 
-/* Backward compatability */
+/* Backward compatibility */
 #define R_METAG_REG32OP1                 6
 #define R_METAG_REG32OP2                 7
 #define R_METAG_REG32OP3                 8
diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
index 453a8a47a467..cb14dd78a2e7 100644
--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c
@@ -901,7 +901,7 @@  int kvmppc_core_check_processor_compat(void)
 {
 	/*
 	 * We always return 0 for book3s. We check
-	 * for compatability while loading the HV
+	 * for compatibility while loading the HV
 	 * or PR module
 	 */
 	return 0;
diff --git a/arch/sparc/include/uapi/asm/pstate.h b/arch/sparc/include/uapi/asm/pstate.h
index 4b6b998afd99..cf832e14aa05 100644
--- a/arch/sparc/include/uapi/asm/pstate.h
+++ b/arch/sparc/include/uapi/asm/pstate.h
@@ -88,7 +88,7 @@ 
 #define VERS_MAXTL	_AC(0x000000000000ff00,UL) /* Max Trap Level.	*/
 #define VERS_MAXWIN	_AC(0x000000000000001f,UL) /* Max RegWindow Idx.*/
 
-/* Compatability Feature Register (%asr26), SPARC-T4 and later  */
+/* Compatibility Feature Register (%asr26), SPARC-T4 and later  */
 #define CFR_AES		_AC(0x0000000000000001,UL) /* Supports AES opcodes     */
 #define CFR_DES		_AC(0x0000000000000002,UL) /* Supports DES opcodes     */
 #define CFR_KASUMI	_AC(0x0000000000000004,UL) /* Supports KASUMI opcodes  */
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index b82ef6262469..12c5b79b0e8f 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -751,7 +751,7 @@  crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state)
  * This function shuts down all the outputs that need to be shut down and
  * prepares them (if required) with the new mode.
  *
- * For compatability with legacy crtc helpers this should be called before
+ * For compatibility with legacy crtc helpers this should be called before
  * drm_atomic_helper_commit_planes(), which is what the default commit function
  * does. But drivers with different needs can group the modeset commits together
  * and do the plane commits at the end. This is useful for drivers doing runtime
@@ -776,7 +776,7 @@  EXPORT_SYMBOL(drm_atomic_helper_commit_modeset_disables);
  * This function enables all the outputs with the new configuration which had to
  * be turned off for the update.
  *
- * For compatability with legacy crtc helpers this should be called after
+ * For compatibility with legacy crtc helpers this should be called after
  * drm_atomic_helper_commit_planes(), which is what the default commit function
  * does. But drivers with different needs can group the modeset commits together
  * and do the plane commits at the end. This is useful for drivers doing runtime
diff --git a/drivers/media/dvb-frontends/au8522_dig.c b/drivers/media/dvb-frontends/au8522_dig.c
index 5d06c99b0e97..edadcc7eea6c 100644
--- a/drivers/media/dvb-frontends/au8522_dig.c
+++ b/drivers/media/dvb-frontends/au8522_dig.c
@@ -922,7 +922,7 @@  module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Enable verbose debug messages");
 
 module_param(zv_mode, int, 0644);
-MODULE_PARM_DESC(zv_mode, "Turn on/off ZeeVee modulator compatability mode (default:on).\n"
+MODULE_PARM_DESC(zv_mode, "Turn on/off ZeeVee modulator compatibility mode (default:on).\n"
 	"\t\ton - modified AU8522 QAM256 initialization.\n"
 	"\t\tProvides faster lock when using ZeeVee modulator based sources");
 
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h
index c6d78790cb0d..193947865efd 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.h
+++ b/drivers/net/wireless/ipw2x00/ipw2100.h
@@ -746,7 +746,7 @@  struct ipw2100_priv {
 #define IPW_REG_GPIO			IPW_REG_DOMAIN_0_OFFSET + 0x0030
 #define IPW_REG_FW_TYPE                 IPW_REG_DOMAIN_1_OFFSET + 0x0188
 #define IPW_REG_FW_VERSION 		IPW_REG_DOMAIN_1_OFFSET + 0x018C
-#define IPW_REG_FW_COMPATABILITY_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x0190
+#define IPW_REG_FW_COMPATIBILITY_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x0190
 
 #define IPW_REG_INDIRECT_ADDR_MASK	0x00FFFFFC