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

Commit 31e6e2da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] fix build-breaking 7a192ec3 commit
  ARM: Add SMSC911X support to Overo platform (V2)
  arm: update omap_ldp defconfig to use smsc911x
  arm: update realview defconfigs to use smsc911x
  arm: update pcm037 defconfig to use smsc911x
  arm: convert omap ldp platform to use smsc911x
  arm: convert realview platform to use smsc911x
  arm: convert pcm037 platform to use smsc911x
  [ARM] 5444/1: ARM: Realview: Fix event-device multiplicators in localtimer.c
  [ARM] 5442/1: pxa/cm-x255: fix reverse RDY gpios in PCMCIA driver
  [ARM] 5441/1: Use pr_err on error paths in at91 pm
  [ARM] 5440/1: Fix VFP state corruption due to preemption during VFP exceptions
  [ARM] 5439/1: Do not clear bit 10 of DFSR during abort handling on ARMv6
  [ARM] 5437/1: Add documentation for "nohlt" kernel parameter
  [ARM] 5436/1: ARM: OMAP: Fix compile for rx51
  [ARM] arch_reset() now takes a second parameter
  [ARM] Kirkwood: small L2 code cleanup
  [ARM] Kirkwood: invalidate L2 cache before enabling it
parents ea02259f 67a52bb9

Documentation/kernel-parameters.txt

+3 −1
Original line number Diff line number Diff line
@@ -1523,7 +1523,9 @@ and is between 256 and 4096 characters. It is defined in the file 


	noclflush	[BUGS=X86] Don't use the CLFLUSH instruction



	nohlt		[BUGS=ARM,SH]

	nohlt		[BUGS=ARM,SH] Tells the kernel that the sleep(SH) or

			wfi(ARM) instruction doesn't work correctly and not to

			use it. This is also useful when using JTAG debugger.



	no-hlt		[BUGS=X86-32] Tells the kernel that the hlt

			instruction doesn't work correctly and not to

arch/arm/configs/omap_ldp_defconfig

+22 −2
Original line number Diff line number Diff line
@@ -474,14 +474,34 @@ CONFIG_NETDEVICES=y 
# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_PHYLIB is not set

CONFIG_PHYLIB=y



#

# MII PHY device drivers

#

# CONFIG_MARVELL_PHY is not set

# CONFIG_DAVICOM_PHY is not set

# CONFIG_QSEMI_PHY is not set

# CONFIG_LXT_PHY is not set

# CONFIG_CICADA_PHY is not set

# CONFIG_VITESSE_PHY is not set

CONFIG_SMSC_PHY=y

# CONFIG_BROADCOM_PHY is not set

# CONFIG_ICPLUS_PHY is not set

# CONFIG_REALTEK_PHY is not set

# CONFIG_NATIONAL_PHY is not set

# CONFIG_STE10XP is not set

# CONFIG_LSI_ET1011C_PHY is not set

# CONFIG_FIXED_PHY is not set

# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

# CONFIG_AX88796 is not set

# CONFIG_SMC91X is not set

# CONFIG_DM9000 is not set

# CONFIG_ENC28J60 is not set

CONFIG_SMC911X=y

# CONFIG_SMC911X is not set

CONFIG_SMSC911X=y

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

arch/arm/configs/pcm037_defconfig

+22 −1
Original line number Diff line number Diff line
@@ -465,12 +465,33 @@ CONFIG_NETDEVICES=y 
# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_PHYLIB is not set

CONFIG_PHYLIB=y



#

# MII PHY device drivers

#

# CONFIG_MARVELL_PHY is not set

# CONFIG_DAVICOM_PHY is not set

# CONFIG_QSEMI_PHY is not set

# CONFIG_LXT_PHY is not set

# CONFIG_CICADA_PHY is not set

# CONFIG_VITESSE_PHY is not set

CONFIG_SMSC_PHY=y

# CONFIG_BROADCOM_PHY is not set

# CONFIG_ICPLUS_PHY is not set

# CONFIG_REALTEK_PHY is not set

# CONFIG_NATIONAL_PHY is not set

# CONFIG_STE10XP is not set

# CONFIG_LSI_ET1011C_PHY is not set

# CONFIG_FIXED_PHY is not set

# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

# CONFIG_AX88796 is not set

CONFIG_SMC91X=y

# CONFIG_DM9000 is not set

# CONFIG_SMC911X is not set

CONFIG_SMSC911X=y

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

arch/arm/configs/realview-smp_defconfig

+22 −2
Original line number Diff line number Diff line
@@ -496,13 +496,33 @@ CONFIG_NETDEVICES=y 
# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_PHYLIB is not set

CONFIG_PHYLIB=y



#

# MII PHY device drivers

#

# CONFIG_MARVELL_PHY is not set

# CONFIG_DAVICOM_PHY is not set

# CONFIG_QSEMI_PHY is not set

# CONFIG_LXT_PHY is not set

# CONFIG_CICADA_PHY is not set

# CONFIG_VITESSE_PHY is not set

CONFIG_SMSC_PHY=y

# CONFIG_BROADCOM_PHY is not set

# CONFIG_ICPLUS_PHY is not set

# CONFIG_REALTEK_PHY is not set

# CONFIG_NATIONAL_PHY is not set

# CONFIG_STE10XP is not set

# CONFIG_LSI_ET1011C_PHY is not set

# CONFIG_FIXED_PHY is not set

# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

# CONFIG_AX88796 is not set

CONFIG_SMC91X=y

# CONFIG_DM9000 is not set

CONFIG_SMC911X=y

# CONFIG_SMC911X is not set

CONFIG_SMSC911X=y

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

arch/arm/configs/realview_defconfig

+22 −2
Original line number Diff line number Diff line
@@ -490,13 +490,33 @@ CONFIG_NETDEVICES=y 
# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_PHYLIB is not set

CONFIG_PHYLIB=y



#

# MII PHY device drivers

#

# CONFIG_MARVELL_PHY is not set

# CONFIG_DAVICOM_PHY is not set

# CONFIG_QSEMI_PHY is not set

# CONFIG_LXT_PHY is not set

# CONFIG_CICADA_PHY is not set

# CONFIG_VITESSE_PHY is not set

CONFIG_SMSC_PHY=y

# CONFIG_BROADCOM_PHY is not set

# CONFIG_ICPLUS_PHY is not set

# CONFIG_REALTEK_PHY is not set

# CONFIG_NATIONAL_PHY is not set

# CONFIG_STE10XP is not set

# CONFIG_LSI_ET1011C_PHY is not set

# CONFIG_FIXED_PHY is not set

# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

# CONFIG_AX88796 is not set

CONFIG_SMC91X=y

# CONFIG_DM9000 is not set

CONFIG_SMC911X=y

# CONFIG_SMC911X is not set

CONFIG_SMSC911X=y

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set