Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b1974de authored by Thomas Weber's avatar Thomas Weber Committed by Jiri Kosina
Browse files

Fix typo: configuation => configuration 



Signed-off-by: default avatarThomas Weber <weber@corscience.de>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 6f0b31c3

arch/arm/mach-omap2/hsmmc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ struct omap2_hsmmc_info { 
	char	*name;		/* or NULL for default */

	char	*name;		/* or NULL for default */

	struct device *dev;	/* returned: pointer to mmc adapter */

	struct device *dev;	/* returned: pointer to mmc adapter */

	int	ocr_mask;	/* temporary HACK */

	int	ocr_mask;	/* temporary HACK */

	/* Remux (pad configuation) when powering on/off */

	/* Remux (pad configuration) when powering on/off */

	void (*remux)(struct device *dev, int slot, int power_on);

	void (*remux)(struct device *dev, int slot, int power_on);

};

};

arch/mips/sibyte/common/sb_tbprof.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include <asm/sibyte/sb1250_scd.h>

#include <asm/sibyte/sb1250_scd.h>

#include <asm/sibyte/sb1250_int.h>

#include <asm/sibyte/sb1250_int.h>

#else

#else

#error invalid SiByte UART configuation

#error invalid SiByte UART configuration

#endif

#endif





#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)

#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)

drivers/net/bnx2x/bnx2x_link.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3735,7 +3735,7 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) 
					/* Clear first 3 bits of the control */

					/* Clear first 3 bits of the control */

					val &= ~0x7;

					val &= ~0x7;

					/* Set control bits according to

					/* Set control bits according to

					configuation */

					configuration */

					val |= (params->xgxs_config_rx[i] &

					val |= (params->xgxs_config_rx[i] &

						0x7);

						0x7);

					DP(NETIF_MSG_LINK, "Setting RX"

					DP(NETIF_MSG_LINK, "Setting RX"

drivers/net/irda/ali-ircc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -142,7 +142,7 @@ static void SetCOMInterrupts(struct ali_ircc_cb *self , unsigned char enable); 
 * Function ali_ircc_init ()

 * Function ali_ircc_init ()

 *

 *

 *    Initialize chip. Find out whay kinds of chips we are dealing with

 *    Initialize chip. Find out whay kinds of chips we are dealing with

 *    and their configuation registers address

 *    and their configuration registers address

 */

 */

static int __init ali_ircc_init(void)

static int __init ali_ircc_init(void)

{

{

drivers/net/sb1250-mac.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -95,7 +95,7 @@ MODULE_PARM_DESC(int_timeout_rx, "RX timeout value"); 
#include <asm/sibyte/sb1250_regs.h>

#include <asm/sibyte/sb1250_regs.h>

#include <asm/sibyte/sb1250_int.h>

#include <asm/sibyte/sb1250_int.h>

#else

#else

#error invalid SiByte MAC configuation

#error invalid SiByte MAC configuration

#endif

#endif

#include <asm/sibyte/sb1250_scd.h>

#include <asm/sibyte/sb1250_scd.h>

#include <asm/sibyte/sb1250_mac.h>

#include <asm/sibyte/sb1250_mac.h>
@@ -106,7 +106,7 @@ MODULE_PARM_DESC(int_timeout_rx, "RX timeout value"); 
#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)

#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)

#define UNIT_INT(n)		(K_INT_MAC_0 + (n))

#define UNIT_INT(n)		(K_INT_MAC_0 + (n))

#else

#else

#error invalid SiByte MAC configuation

#error invalid SiByte MAC configuration

#endif

#endif





#ifdef K_INT_PHY

#ifdef K_INT_PHY
@@ -1568,7 +1568,7 @@ static void sbmac_channel_start(struct sbmac_softc *s) 
		       M_MAC_RX_ENABLE |

		       M_MAC_RX_ENABLE |

		       M_MAC_TX_ENABLE, s->sbm_macenable);

		       M_MAC_TX_ENABLE, s->sbm_macenable);

#else

#else

#error invalid SiByte MAC configuation

#error invalid SiByte MAC configuration

#endif

#endif





#ifdef CONFIG_SBMAC_COALESCE

#ifdef CONFIG_SBMAC_COALESCE