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

Commit 0c54de14 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'sh/stable-updates'

parents 8faba612 7dc9c484

Documentation/networking/3c509.txt

+8 −4
Original line number Diff line number Diff line
@@ -48,11 +48,11 @@ for LILO parameters for doing this: 
This configures the first found 3c509 card for IRQ 10, base I/O 0x310, and

transceiver type 3 (10base2). The flag "0x3c509" must be set to avoid conflicts

with other card types when overriding the I/O address. When the driver is

loaded as a module, only the IRQ and transceiver setting may be overridden.

For example, setting two cards to 10base2/IRQ10 and AUI/IRQ11 is done by using

the xcvr and irq module options:

loaded as a module, only the IRQ may be overridden. For example,

setting two cards to IRQ10 and IRQ11 is done by using the irq module

option:



   options 3c509 xcvr=3,1 irq=10,11

   options 3c509 irq=10,11





(2) Full-duplex mode
@@ -78,6 +78,8 @@ itself full-duplex capable. This is almost certainly one of two things: a full- 
duplex-capable  Ethernet switch (*not* a hub), or a full-duplex-capable NIC on

another system that's connected directly to the 3c509B via a crossover cable.



Full-duplex mode can be enabled using 'ethtool'.

 

/////Extremely important caution concerning full-duplex mode/////

Understand that the 3c509B's hardware's full-duplex support is much more

limited than that provide by more modern network interface cards. Although
@@ -114,6 +116,8 @@ never automatically enable full-duplex mode in an existing installation; 
it must always be explicitly enabled via one of these code in order to be

activated.



The transceiver type can be changed using 'ethtool'.

  



(4a) Interpretation of error messages and common problems

MAINTAINERS

+5 −15
Original line number Diff line number Diff line
@@ -410,9 +410,8 @@ F: drivers/i2c/busses/i2c-ali1563.c 


ALPHA PORT

M:	Richard Henderson <rth@twiddle.net>

S:	Odd Fixes for 2.4; Maintained for 2.6.

M:	Ivan Kokshaysky <ink@jurassic.park.msu.ru>

S:	Maintained for 2.4; PCI support for 2.6.

M:	Matt Turner <mattst88@gmail.com>

L:	linux-alpha@vger.kernel.org

F:	arch/alpha/
@@ -3940,29 +3939,20 @@ S: Maintained 
F:	sound/soc/omap/



OMAP FRAMEBUFFER SUPPORT

M:	Imre Deak <imre.deak@nokia.com>

M:	Tomi Valkeinen <tomi.valkeinen@nokia.com>

L:	linux-fbdev@vger.kernel.org

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	drivers/video/omap/



OMAP DISPLAY SUBSYSTEM SUPPORT (DSS2)

OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)

M:	Tomi Valkeinen <tomi.valkeinen@nokia.com>

L:	linux-omap@vger.kernel.org

L:	linux-fbdev@vger.kernel.org (moderated for non-subscribers)

L:	linux-fbdev@vger.kernel.org

S:	Maintained

F:	drivers/video/omap2/dss/

F:	drivers/video/omap2/vrfb.c

F:	drivers/video/omap2/vram.c

F:	drivers/video/omap2/

F:	Documentation/arm/OMAP/DSS



OMAP FRAMEBUFFER SUPPORT (FOR DSS2)

M:	Tomi Valkeinen <tomi.valkeinen@nokia.com>

L:	linux-omap@vger.kernel.org

L:	linux-fbdev@vger.kernel.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/video/omap2/omapfb/



OMAP MMC SUPPORT

M:	Jarkko Lavinen <jarkko.lavinen@nokia.com>

L:	linux-omap@vger.kernel.org

Makefile

+2 −3
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 33

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Man-Eating Seals of Antiquity



# *DOCUMENTATION*
@@ -18,10 +18,9 @@ MAKEFLAGS += -rR --no-print-directory 


# Avoid funny character set dependencies

unexport LC_ALL

LC_CTYPE=C

LC_COLLATE=C

LC_NUMERIC=C

export LC_CTYPE LC_COLLATE LC_NUMERIC

export LC_COLLATE LC_NUMERIC



# We are using a recursive build, so we need to do a little thinking

# to get the ordering right.

arch/alpha/include/asm/topology.h

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ static const struct cpumask *cpumask_of_node(int node) 
{

	int cpu;



	if (node == -1)

		return cpu_all_mask;



	cpumask_clear(&node_to_cpumask_map[node]);



	for_each_online_cpu(cpu) {

arch/arm/configs/u300_defconfig

+71 −10
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.32-rc5

# Sat Oct 17 23:32:24 2009

# Linux kernel version: 2.6.33-rc2

# Wed Jan  6 00:01:36 2010

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -46,6 +46,7 @@ CONFIG_SYSVIPC_SYSCTL=y 
#

CONFIG_TREE_RCU=y

# CONFIG_TREE_PREEMPT_RCU is not set

# CONFIG_TINY_RCU is not set

# CONFIG_RCU_TRACE is not set

CONFIG_RCU_FANOUT=32

# CONFIG_RCU_FANOUT_EXACT is not set
@@ -119,14 +120,41 @@ CONFIG_BLOCK=y 
# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

# CONFIG_IOSCHED_AS is not set

CONFIG_IOSCHED_DEADLINE=y

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_DEFAULT_AS is not set

CONFIG_DEFAULT_DEADLINE=y

# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="deadline"

# CONFIG_INLINE_SPIN_TRYLOCK is not set

# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set

# CONFIG_INLINE_SPIN_LOCK is not set

# CONFIG_INLINE_SPIN_LOCK_BH is not set

# CONFIG_INLINE_SPIN_LOCK_IRQ is not set

# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set

# CONFIG_INLINE_SPIN_UNLOCK is not set

# CONFIG_INLINE_SPIN_UNLOCK_BH is not set

# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set

# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set

# CONFIG_INLINE_READ_TRYLOCK is not set

# CONFIG_INLINE_READ_LOCK is not set

# CONFIG_INLINE_READ_LOCK_BH is not set

# CONFIG_INLINE_READ_LOCK_IRQ is not set

# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set

# CONFIG_INLINE_READ_UNLOCK is not set

# CONFIG_INLINE_READ_UNLOCK_BH is not set

# CONFIG_INLINE_READ_UNLOCK_IRQ is not set

# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set

# CONFIG_INLINE_WRITE_TRYLOCK is not set

# CONFIG_INLINE_WRITE_LOCK is not set

# CONFIG_INLINE_WRITE_LOCK_BH is not set

# CONFIG_INLINE_WRITE_LOCK_IRQ is not set

# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set

# CONFIG_INLINE_WRITE_UNLOCK is not set

# CONFIG_INLINE_WRITE_UNLOCK_BH is not set

# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set

# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set

# CONFIG_MUTEX_SPIN_ON_OWNER is not set

# CONFIG_FREEZER is not set



#
@@ -155,6 +183,7 @@ CONFIG_MMU=y 
# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_DOVE is not set

# CONFIG_ARCH_KIRKWOOD is not set

# CONFIG_ARCH_LOKI is not set

# CONFIG_ARCH_MV78XX0 is not set
@@ -177,6 +206,7 @@ CONFIG_ARCH_U300=y 
# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_BCMRING is not set

# CONFIG_ARCH_U8500 is not set



#

# ST-Ericsson AB U300/U330/U335/U365 Platform
@@ -265,12 +295,10 @@ CONFIG_FLATMEM_MANUAL=y 
CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4096

CONFIG_SPLIT_PTLOCK_CPUS=999999

# CONFIG_PHYS_ADDR_T_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0

CONFIG_VIRT_TO_BUS=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

# CONFIG_KSM is not set

CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

CONFIG_ALIGNMENT_TRAP=y
@@ -499,14 +527,21 @@ CONFIG_MTD_NAND_IDS=y 
CONFIG_BLK_DEV=y

# CONFIG_BLK_DEV_COW_COMMON is not set

# CONFIG_BLK_DEV_LOOP is not set



#

# DRBD disabled because PROC_FS, INET or CONNECTOR not selected

#

# CONFIG_BLK_DEV_NBD is not set

# CONFIG_BLK_DEV_RAM is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set

CONFIG_MISC_DEVICES=y

# CONFIG_AD525X_DPOT is not set

# CONFIG_ICS932S401 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_ISL29003 is not set

# CONFIG_DS1682 is not set

# CONFIG_TI_DAC7512 is not set

# CONFIG_C2PORT is not set



#
@@ -517,6 +552,7 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_EEPROM_LEGACY is not set

# CONFIG_EEPROM_MAX6875 is not set

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_IWMC3200TOP is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -539,6 +575,7 @@ CONFIG_HAVE_IDE=y 
CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set

# CONFIG_INPUT_POLLDEV is not set

# CONFIG_INPUT_SPARSEKMAP is not set



#

# Userland interfaces
@@ -645,7 +682,6 @@ CONFIG_I2C_STU300=y 
#

# Miscellaneous I2C Chip support

#

# CONFIG_DS1682 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set
@@ -661,6 +697,8 @@ CONFIG_SPI_MASTER=y 
# CONFIG_SPI_BITBANG is not set

# CONFIG_SPI_GPIO is not set

CONFIG_SPI_PL022=y

# CONFIG_SPI_XILINX is not set

# CONFIG_SPI_DESIGNWARE is not set



#

# SPI Protocol Masters
@@ -708,6 +746,7 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_T7L66XB is not set

# CONFIG_MFD_TC6387XB is not set

# CONFIG_PMIC_DA903X is not set

# CONFIG_PMIC_ADP5520 is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM831X is not set

# CONFIG_MFD_WM8350_I2C is not set
@@ -716,6 +755,8 @@ CONFIG_SSB_POSSIBLE=y 
CONFIG_AB3100_CORE=y

CONFIG_AB3100_OTP=y

# CONFIG_EZX_PCAP is not set

# CONFIG_MFD_88PM8607 is not set

# CONFIG_AB4500_CORE is not set

CONFIG_REGULATOR=y

# CONFIG_REGULATOR_DEBUG is not set

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
@@ -723,6 +764,7 @@ CONFIG_REGULATOR=y 
# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set

# CONFIG_REGULATOR_BQ24022 is not set

# CONFIG_REGULATOR_MAX1586 is not set

# CONFIG_REGULATOR_MAX8660 is not set

# CONFIG_REGULATOR_LP3971 is not set

CONFIG_REGULATOR_AB3100=y

# CONFIG_REGULATOR_TPS65023 is not set
@@ -840,7 +882,9 @@ CONFIG_LEDS_CLASS=y 
# CONFIG_LEDS_LP3944 is not set

# CONFIG_LEDS_PCA955X is not set

# CONFIG_LEDS_DAC124S085 is not set

# CONFIG_LEDS_REGULATOR is not set

# CONFIG_LEDS_BD2802 is not set

# CONFIG_LEDS_LT3593 is not set



#

# LED Triggers
@@ -882,6 +926,7 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_PCF8563 is not set

# CONFIG_RTC_DRV_PCF8583 is not set

# CONFIG_RTC_DRV_M41T80 is not set

# CONFIG_RTC_DRV_BQ32K is not set

# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set

# CONFIG_RTC_DRV_RX8581 is not set
@@ -911,7 +956,9 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_M48T86 is not set

# CONFIG_RTC_DRV_M48T35 is not set

# CONFIG_RTC_DRV_M48T59 is not set

# CONFIG_RTC_DRV_MSM6242 is not set

# CONFIG_RTC_DRV_BQ4802 is not set

# CONFIG_RTC_DRV_RP5C01 is not set

# CONFIG_RTC_DRV_V3020 is not set

CONFIG_RTC_DRV_AB3100=y
@@ -926,6 +973,15 @@ CONFIG_DMADEVICES=y 
#

# DMA Devices

#

CONFIG_COH901318=y

CONFIG_DMA_ENGINE=y



#

# DMA Clients

#

# CONFIG_NET_DMA is not set

# CONFIG_ASYNC_TX_DMA is not set

# CONFIG_DMATEST is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set
@@ -1018,7 +1074,7 @@ CONFIG_MISC_FILESYSTEMS=y 
CONFIG_MSDOS_PARTITION=y

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="iso8859-1"

# CONFIG_NLS_CODEPAGE_437 is not set

CONFIG_NLS_CODEPAGE_437=y

# CONFIG_NLS_CODEPAGE_737 is not set

# CONFIG_NLS_CODEPAGE_775 is not set

# CONFIG_NLS_CODEPAGE_850 is not set
@@ -1135,6 +1191,7 @@ CONFIG_ARM_UNWIND=y 
# CONFIG_DEBUG_ERRORS is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_LL is not set

# CONFIG_OC_ETM is not set



#

# Security options
@@ -1142,7 +1199,11 @@ CONFIG_ARM_UNWIND=y 
# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITYFS is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_DEFAULT_SECURITY_SELINUX is not set

# CONFIG_DEFAULT_SECURITY_SMACK is not set

# CONFIG_DEFAULT_SECURITY_TOMOYO is not set

CONFIG_DEFAULT_SECURITY_DAC=y

CONFIG_DEFAULT_SECURITY=""

# CONFIG_CRYPTO is not set

# CONFIG_BINARY_PRINTF is not set