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

Commit 5893a657 authored by Steve French's avatar Steve French
Browse files

Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git

parents d6e04ae6 c0105338

CREDITS

+1 −5
Original line number Diff line number Diff line
@@ -2475,13 +2475,9 @@ S: Potsdam, New York 13676 
S: USA



N: Dave Neuer

E: dneuer@innovation-charter.com

E: mr_fred_smoothie@yahoo.com

E: dave.neuer@pobox.com

D: Helped implement support for Compaq's H31xx series iPAQs

D: Other mostly minor tweaks & bugfixes

S: 325 E. Main St., Suite 3

S: Carnegie, PA 15105

S: USA



N: Michael Neuffer

E: mike@i-Connect.Net

arch/arm/Kconfig

+4 −2
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ source "drivers/cpufreq/Kconfig" 


config CPU_FREQ_SA1100

	bool

	depends on CPU_FREQ && (SA1100_LART || SA1100_PLEB)

	depends on CPU_FREQ && (SA1100_H3100 || SA1100_H3600 || SA1100_H3800 || SA1100_LART || SA1100_PLEB || SA1100_BADGE4 || SA1100_HACKKIT)

	default y



config CPU_FREQ_SA1110
@@ -689,7 +689,9 @@ source "drivers/block/Kconfig" 


source "drivers/acorn/block/Kconfig"



if ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX || ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC || ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE

if PCMCIA || ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX \

	|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \

	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE

source "drivers/ide/Kconfig"

endif

arch/arm/boot/compressed/head-xscale.S

+7 −0
Original line number Diff line number Diff line
@@ -47,3 +47,10 @@ __XScale_start: 
               orr     r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00)

#endif



#ifdef CONFIG_ARCH_IXP2000

		mov	r1, #-1

		mov	r0, #0xd6000000

		str	r1, [r0, #0x14]

		str	r1, [r0, #0x18]

#endif

arch/arm/configs/badge4_defconfig

+18 −11
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-rc1-bk2

# Sat Mar 26 21:32:26 2005

# Linux kernel version: 2.6.12-rc6-git3

# Thu Jun  9 19:00:50 2005

#

CONFIG_ARM=y

CONFIG_MMU=y
@@ -16,6 +16,7 @@ CONFIG_GENERIC_IOMAP=y 
CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_INIT_ENV_ARG_LIMIT=32



#

# General setup
@@ -34,6 +35,8 @@ CONFIG_EMBEDDED=y 
CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y
@@ -109,7 +112,6 @@ CONFIG_CPU_ABRT_EV4=y 
CONFIG_CPU_CACHE_V4WB=y

CONFIG_CPU_CACHE_VIVT=y

CONFIG_CPU_TLB_V4WB=y

CONFIG_CPU_MINICACHE=y



#

# Processor Features
@@ -122,6 +124,7 @@ CONFIG_FORCE_MAX_ZONEORDER=9 
# Bus support

#

CONFIG_ISA=y

CONFIG_ISA_DMA_API=y



#

# PCCARD (PCMCIA/CardBus) support
@@ -131,6 +134,7 @@ CONFIG_ISA=y 
#

# Kernel Features

#

# CONFIG_SMP is not set

# CONFIG_PREEMPT is not set

CONFIG_DISCONTIGMEM=y

# CONFIG_LEDS is not set
@@ -152,12 +156,14 @@ CONFIG_CPU_FREQ_TABLE=y 
# CONFIG_CPU_FREQ_DEBUG is not set

CONFIG_CPU_FREQ_STAT=y

# CONFIG_CPU_FREQ_STAT_DETAILS is not set

CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set

CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_PERFORMANCE=y

# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set

# CONFIG_CPU_FREQ_GOV_USERSPACE is not set

CONFIG_CPU_FREQ_GOV_USERSPACE=y

# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set

# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set

CONFIG_CPU_FREQ_SA1100=y



#

# Floating point emulation
@@ -294,7 +300,6 @@ CONFIG_PARPORT_NOT_PC=y 
#

# Block devices

#

# CONFIG_BLK_DEV_FD is not set

# CONFIG_BLK_DEV_XD is not set

# CONFIG_PARIDE is not set

# CONFIG_BLK_DEV_COW_COMMON is not set
@@ -428,7 +433,6 @@ CONFIG_NET=y 
#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

# CONFIG_NETLINK_DEV is not set

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y
@@ -526,6 +530,7 @@ CONFIG_IRDA_ULTRA=y 
# CONFIG_SMC_IRCC_FIR is not set

# CONFIG_ALI_FIR is not set

CONFIG_SA1100_FIR=y

# CONFIG_VIA_FIR is not set

CONFIG_BT=m

CONFIG_BT_L2CAP=m

# CONFIG_BT_SCO is not set
@@ -618,7 +623,6 @@ CONFIG_NET_WIRELESS=y 
#

# CONFIG_SERIO is not set

# CONFIG_GAMEPORT is not set

CONFIG_SOUND_GAMEPORT=y



#

# Character devices
@@ -687,7 +691,6 @@ CONFIG_RTC=m 
#

# TPM devices

#

# CONFIG_TCG_TPM is not set



#

# I2C support
@@ -736,6 +739,7 @@ CONFIG_I2C_ELEKTOR=m 
# CONFIG_SENSORS_LM85 is not set

# CONFIG_SENSORS_LM87 is not set

# CONFIG_SENSORS_LM90 is not set

# CONFIG_SENSORS_LM92 is not set

# CONFIG_SENSORS_MAX1619 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_SMSC47B397 is not set
@@ -747,6 +751,7 @@ CONFIG_I2C_ELEKTOR=m 
#

# Other I2C Chip support

#

# CONFIG_SENSORS_DS1337 is not set

# CONFIG_SENSORS_EEPROM is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCF8591 is not set
@@ -871,7 +876,6 @@ CONFIG_USB_PRINTER=m 
#

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE_DEBUG=y

# CONFIG_USB_STORAGE_RW_DETECT is not set

# CONFIG_USB_STORAGE_DATAFAB is not set

# CONFIG_USB_STORAGE_FREECOM is not set

# CONFIG_USB_STORAGE_ISD200 is not set
@@ -954,9 +958,11 @@ CONFIG_USB_USS720=m 
#

CONFIG_USB_SERIAL=m

CONFIG_USB_SERIAL_GENERIC=y

# CONFIG_USB_SERIAL_AIRPRIME is not set

CONFIG_USB_SERIAL_BELKIN=m

CONFIG_USB_SERIAL_WHITEHEAT=m

CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m

# CONFIG_USB_SERIAL_CP2101 is not set

# CONFIG_USB_SERIAL_CYPRESS_M8 is not set

CONFIG_USB_SERIAL_EMPEG=m

CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -985,6 +991,7 @@ CONFIG_USB_SERIAL_KEYSPAN=m 
# CONFIG_USB_SERIAL_KOBIL_SCT is not set

CONFIG_USB_SERIAL_MCT_U232=m

CONFIG_USB_SERIAL_PL2303=m

# CONFIG_USB_SERIAL_HP4X is not set

# CONFIG_USB_SERIAL_SAFE is not set

# CONFIG_USB_SERIAL_TI is not set

CONFIG_USB_SERIAL_CYBERJACK=m

arch/arm/configs/h3600_defconfig

+15 −9
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-rc1-bk2

# Mon Mar 28 00:02:26 2005

# Linux kernel version: 2.6.12-rc4

# Thu Jun  9 01:59:03 2005

#

CONFIG_ARM=y

CONFIG_MMU=y
@@ -16,6 +16,7 @@ CONFIG_GENERIC_IOMAP=y 
CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_INIT_ENV_ARG_LIMIT=32



#

# General setup
@@ -33,6 +34,8 @@ CONFIG_KOBJECT_UEVENT=y 
# CONFIG_EMBEDDED is not set

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y
@@ -120,6 +123,7 @@ CONFIG_CPU_MINICACHE=y 
# Bus support

#

CONFIG_ISA=y

CONFIG_ISA_DMA_API=y



#

# PCCARD (PCMCIA/CardBus) support
@@ -138,6 +142,7 @@ CONFIG_PCMCIA_SA1100=y 
#

# Kernel Features

#

# CONFIG_SMP is not set

# CONFIG_PREEMPT is not set

CONFIG_DISCONTIGMEM=y

# CONFIG_LEDS is not set
@@ -159,12 +164,13 @@ CONFIG_CPU_FREQ_TABLE=y 
# CONFIG_CPU_FREQ_DEBUG is not set

CONFIG_CPU_FREQ_STAT=y

# CONFIG_CPU_FREQ_STAT_DETAILS is not set

CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set

CONFIG_CPU_FREQ_GOV_PERFORMANCE=y

# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set

CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y

# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set

# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set

# CONFIG_CPU_FREQ_GOV_USERSPACE is not set

CONFIG_CPU_FREQ_GOV_USERSPACE=y

# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set

CONFIG_CPU_FREQ_SA1100=y



#

# Floating point emulation
@@ -298,7 +304,6 @@ CONFIG_MTD_SA1100=y 
#

# Block devices

#

# CONFIG_BLK_DEV_FD is not set

# CONFIG_BLK_DEV_XD is not set

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=m
@@ -379,7 +384,6 @@ CONFIG_NET=y 
# Networking options

#

# CONFIG_PACKET is not set

# CONFIG_NETLINK_DEV is not set

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y
@@ -476,6 +480,7 @@ CONFIG_IRCOMM=m 
# CONFIG_SMC_IRCC_FIR is not set

# CONFIG_ALI_FIR is not set

CONFIG_SA1100_FIR=m

# CONFIG_VIA_FIR is not set

# CONFIG_BT is not set

CONFIG_NETDEVICES=y

# CONFIG_DUMMY is not set
@@ -647,7 +652,6 @@ CONFIG_LEGACY_PTY_COUNT=256 
#

# TPM devices

#

# CONFIG_TCG_TPM is not set



#

# I2C support
@@ -676,9 +680,11 @@ CONFIG_FB_CFB_FILLRECT=y 
CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

CONFIG_FB_SOFT_CURSOR=y

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_MODE_HELPERS is not set

# CONFIG_FB_TILEBLITTING is not set

CONFIG_FB_SA1100=y

# CONFIG_FB_S1D13XXX is not set

# CONFIG_FB_VIRTUAL is not set



#