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

Commit 9b4311ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

parents 2949ccf9 0647d8cf

arch/ia64/configs/sn2_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ CONFIG_ACPI_DEALLOCATE_IRQ=y 
# Firmware Drivers

#

CONFIG_EFI_VARS=y

# CONFIG_EFI_PCDP is not set

CONFIG_EFI_PCDP=y

CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_MISC is not set
@@ -650,7 +650,7 @@ CONFIG_MMTIMER=y 
#

# Console display driver support

#

# CONFIG_VGA_CONSOLE is not set

CONFIG_VGA_CONSOLE=y

CONFIG_DUMMY_CONSOLE=y



#

arch/ia64/configs/tiger_defconfig

+31 −8
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-20050621

# Tue Jun 21 14:03:24 2005

# Linux kernel version: 2.6.13-rc1-20050629

# Wed Jun 29 15:28:12 2005

#



#
@@ -80,18 +80,29 @@ CONFIG_MCKINLEY=y 
# CONFIG_IA64_PAGE_SIZE_8KB is not set

CONFIG_IA64_PAGE_SIZE_16KB=y

# CONFIG_IA64_PAGE_SIZE_64KB is not set

# CONFIG_HZ_100 is not set

CONFIG_HZ_250=y

# CONFIG_HZ_1000 is not set

CONFIG_HZ=250

CONFIG_IA64_L1_CACHE_SHIFT=7

# CONFIG_NUMA is not set

CONFIG_VIRTUAL_MEM_MAP=y

CONFIG_HOLES_IN_ZONE=y

CONFIG_IA64_CYCLONE=y

CONFIG_IOSAPIC=y

# CONFIG_IA64_SGI_SN_XP is not set

CONFIG_FORCE_MAX_ZONEORDER=18

CONFIG_SMP=y

CONFIG_NR_CPUS=4

CONFIG_HOTPLUG_CPU=y

# CONFIG_SCHED_SMT is not set

# CONFIG_PREEMPT is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set

# CONFIG_SPARSEMEM_MANUAL is not set

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

CONFIG_HAVE_DEC_LOCK=y

CONFIG_IA32_SUPPORT=y

CONFIG_COMPAT=y
@@ -257,6 +268,7 @@ CONFIG_BLK_DEV_CMD64X=y 
# CONFIG_BLK_DEV_HPT366 is not set

# CONFIG_BLK_DEV_SC1200 is not set

CONFIG_BLK_DEV_PIIX=y

# CONFIG_BLK_DEV_IT821X is not set

# CONFIG_BLK_DEV_NS87415 is not set

# CONFIG_BLK_DEV_PDC202XX_OLD is not set

# CONFIG_BLK_DEV_PDC202XX_NEW is not set
@@ -395,6 +407,7 @@ CONFIG_UNIX=y 
CONFIG_INET=y

CONFIG_IP_MULTICAST=y

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

# CONFIG_IP_PNP is not set

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set
@@ -407,6 +420,8 @@ CONFIG_SYN_COOKIES=y 
# CONFIG_INET_TUNNEL is not set

CONFIG_IP_TCPDIAG=y

# CONFIG_IP_TCPDIAG_IPV6 is not set

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

# CONFIG_IPV6 is not set

# CONFIG_NETFILTER is not set
@@ -598,9 +613,7 @@ CONFIG_GAMEPORT=m 
# CONFIG_GAMEPORT_NS558 is not set

# CONFIG_GAMEPORT_L4 is not set

# CONFIG_GAMEPORT_EMU10K1 is not set

# CONFIG_GAMEPORT_VORTEX is not set

# CONFIG_GAMEPORT_FM801 is not set

# CONFIG_GAMEPORT_CS461X is not set



#

# Character devices
@@ -629,7 +642,6 @@ CONFIG_SERIAL_8250_NR_UARTS=6 
CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

# CONFIG_SERIAL_8250_DETECT_IRQ is not set

# CONFIG_SERIAL_8250_MULTIPORT is not set

# CONFIG_SERIAL_8250_RSA is not set



#
@@ -743,6 +755,7 @@ CONFIG_USB_DEVICEFS=y 
CONFIG_USB_EHCI_HCD=m

# CONFIG_USB_EHCI_SPLIT_ISO is not set

# CONFIG_USB_EHCI_ROOT_HUB_TT is not set

# CONFIG_USB_ISP116X_HCD is not set

CONFIG_USB_OHCI_HCD=m

# CONFIG_USB_OHCI_BIG_ENDIAN is not set

CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -779,9 +792,11 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_HIDDEV is not set

# CONFIG_USB_AIPTEK is not set

# CONFIG_USB_WACOM is not set

# CONFIG_USB_ACECAD is not set

# CONFIG_USB_KBTAB is not set

# CONFIG_USB_POWERMATE is not set

# CONFIG_USB_MTOUCH is not set

# CONFIG_USB_ITMTOUCH is not set

# CONFIG_USB_EGALAX is not set

# CONFIG_USB_XPAD is not set

# CONFIG_USB_ATI_REMOTE is not set
@@ -838,7 +853,7 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_TEST is not set



#

# USB ATM/DSL drivers

# USB DSL modem support

#



#
@@ -856,6 +871,10 @@ CONFIG_USB_HIDINPUT=y 
#

# CONFIG_INFINIBAND is not set



#

# SN Devices

#



#

# File systems

#
@@ -863,6 +882,7 @@ CONFIG_EXT2_FS=y 
CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS_XATTR=y

CONFIG_EXT3_FS_POSIX_ACL=y
@@ -922,7 +942,6 @@ CONFIG_NTFS_FS=m 
CONFIG_PROC_FS=y

CONFIG_PROC_KCORE=y

CONFIG_SYSFS=y

# CONFIG_DEVFS_FS is not set

# CONFIG_DEVPTS_FS_XATTR is not set

CONFIG_TMPFS=y

CONFIG_TMPFS_XATTR=y
@@ -953,15 +972,18 @@ CONFIG_RAMFS=y 
#

CONFIG_NFS_FS=m

CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set

CONFIG_NFS_V4=y

CONFIG_NFS_DIRECTIO=y

CONFIG_NFSD=m

CONFIG_NFSD_V3=y

# CONFIG_NFSD_V3_ACL is not set

CONFIG_NFSD_V4=y

CONFIG_NFSD_TCP=y

CONFIG_LOCKD=m

CONFIG_LOCKD_V4=y

CONFIG_EXPORTFS=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=m

CONFIG_SUNRPC_GSS=m

CONFIG_RPCSEC_GSS_KRB5=m
@@ -1069,6 +1091,7 @@ CONFIG_LOG_BUF_SHIFT=20 
# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_KPROBES is not set

CONFIG_IA64_GRANULE_16MB=y

# CONFIG_IA64_GRANULE_64MB is not set

# CONFIG_IA64_PRINT_HAZARDS is not set
@@ -1090,7 +1113,7 @@ CONFIG_CRYPTO=y 
# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_MD4 is not set

CONFIG_CRYPTO_MD5=m

CONFIG_CRYPTO_MD5=y

# CONFIG_CRYPTO_SHA1 is not set

# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA512 is not set

arch/ia64/configs/zx1_defconfig

+122 −44
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.10

# Wed Dec 29 09:05:48 2004

# Linux kernel version: 2.6.13-rc1-20050629

# Wed Jun 29 15:31:11 2005

#



#
@@ -12,6 +12,7 @@ CONFIG_EXPERIMENTAL=y 
CONFIG_BROKEN=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32



#

# General setup
@@ -24,23 +25,26 @@ CONFIG_BSD_PROCESS_ACCT=y 
# CONFIG_BSD_PROCESS_ACCT_V3 is not set

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

CONFIG_LOG_BUF_SHIFT=17

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

# CONFIG_IKCONFIG is not set

# CONFIG_CPUSETS is not set

# CONFIG_EMBEDDED is not set

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

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0



#

# Loadable module support
@@ -59,12 +63,15 @@ CONFIG_IA64=y 
CONFIG_64BIT=y

CONFIG_MMU=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_TIME_INTERPOLATION=y

CONFIG_EFI=y

CONFIG_GENERIC_IOMAP=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

# CONFIG_IA64_GENERIC is not set

# CONFIG_IA64_DIG is not set

CONFIG_IA64_HP_ZX1=y

# CONFIG_IA64_HP_ZX1_SWIOTLB is not set

# CONFIG_IA64_SGI_SN2 is not set

# CONFIG_IA64_HP_SIM is not set

# CONFIG_ITANIUM is not set
@@ -73,22 +80,36 @@ CONFIG_MCKINLEY=y 
# CONFIG_IA64_PAGE_SIZE_8KB is not set

CONFIG_IA64_PAGE_SIZE_16KB=y

# CONFIG_IA64_PAGE_SIZE_64KB is not set

# CONFIG_HZ_100 is not set

CONFIG_HZ_250=y

# CONFIG_HZ_1000 is not set

CONFIG_HZ=250

CONFIG_IA64_L1_CACHE_SHIFT=7

# CONFIG_NUMA is not set

CONFIG_VIRTUAL_MEM_MAP=y

CONFIG_HOLES_IN_ZONE=y

# CONFIG_IA64_CYCLONE is not set

CONFIG_IOSAPIC=y

# CONFIG_IA64_SGI_SN_XP is not set

CONFIG_FORCE_MAX_ZONEORDER=18

CONFIG_SMP=y

CONFIG_NR_CPUS=16

# CONFIG_HOTPLUG_CPU is not set

# CONFIG_SCHED_SMT is not set

# CONFIG_PREEMPT is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set

# CONFIG_SPARSEMEM_MANUAL is not set

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

CONFIG_HAVE_DEC_LOCK=y

CONFIG_IA32_SUPPORT=y

CONFIG_COMPAT=y

CONFIG_IA64_MCA_RECOVERY=y

CONFIG_PERFMON=y

CONFIG_IA64_PALINFO=y

CONFIG_ACPI_DEALLOCATE_IRQ=y



#

# Firmware Drivers
@@ -120,6 +141,7 @@ CONFIG_ACPI_BUS=y 
CONFIG_ACPI_POWER=y

CONFIG_ACPI_PCI=y

CONFIG_ACPI_SYSTEM=y

# CONFIG_ACPI_CONTAINER is not set



#

# Bus options (PCI, PCMCIA)
@@ -129,6 +151,7 @@ CONFIG_PCI_DOMAINS=y 
# CONFIG_PCI_MSI is not set

CONFIG_PCI_LEGACY_PROC=y

CONFIG_PCI_NAMES=y

# CONFIG_PCI_DEBUG is not set



#

# PCI Hotplug Support
@@ -138,7 +161,6 @@ CONFIG_HOTPLUG_PCI=y 
CONFIG_HOTPLUG_PCI_ACPI=y

# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set

# CONFIG_HOTPLUG_PCI_CPCI is not set

# CONFIG_HOTPLUG_PCI_PCIE is not set

# CONFIG_HOTPLUG_PCI_SHPC is not set



#
@@ -146,10 +168,6 @@ CONFIG_HOTPLUG_PCI_ACPI=y 
#

# CONFIG_PCCARD is not set



#

# PC-card bridges

#



#

# Device Drivers

#
@@ -184,6 +202,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
# CONFIG_BLK_CPQ_CISS_DA is not set

# CONFIG_BLK_DEV_DAC960 is not set

# CONFIG_BLK_DEV_UMEM is not set

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=y

# CONFIG_BLK_DEV_CRYPTOLOOP is not set

# CONFIG_BLK_DEV_NBD is not set
@@ -203,6 +222,7 @@ CONFIG_IOSCHED_NOOP=y 
CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

# CONFIG_ATA_OVER_ETH is not set



#

# ATA/ATAPI/MFM/RLL support
@@ -246,6 +266,7 @@ CONFIG_BLK_DEV_CMD64X=y 
# CONFIG_BLK_DEV_HPT366 is not set

# CONFIG_BLK_DEV_SC1200 is not set

# CONFIG_BLK_DEV_PIIX is not set

# CONFIG_BLK_DEV_IT821X is not set

# CONFIG_BLK_DEV_NS87415 is not set

# CONFIG_BLK_DEV_PDC202XX_OLD is not set

# CONFIG_BLK_DEV_PDC202XX_NEW is not set
@@ -275,6 +296,7 @@ CONFIG_CHR_DEV_OSST=y 
CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=y

# CONFIG_CHR_DEV_SCH is not set



#

# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -288,6 +310,7 @@ CONFIG_SCSI_LOGGING=y 
#

CONFIG_SCSI_SPI_ATTRS=y

# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set



#

# SCSI low-level drivers
@@ -303,13 +326,10 @@ CONFIG_SCSI_SPI_ATTRS=y 
# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_SCSI_SATA is not set

# CONFIG_SCSI_BUSLOGIC is not set

# CONFIG_SCSI_CPQFCTS is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_EATA is not set

# CONFIG_SCSI_EATA_PIO is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_GDTH is not set

# CONFIG_SCSI_IPS is not set

# CONFIG_SCSI_INITIO is not set

# CONFIG_SCSI_INIA100 is not set
@@ -319,8 +339,6 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64

# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set

# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_PCI2000 is not set

# CONFIG_SCSI_PCI2220I is not set

# CONFIG_SCSI_QLOGIC_ISP is not set

# CONFIG_SCSI_QLOGIC_FC is not set

CONFIG_SCSI_QLOGIC_1280=y
@@ -331,7 +349,7 @@ CONFIG_SCSI_QLA2XXX=y 
# CONFIG_SCSI_QLA2300 is not set

# CONFIG_SCSI_QLA2322 is not set

# CONFIG_SCSI_QLA6312 is not set

# CONFIG_SCSI_QLA6322 is not set

# CONFIG_SCSI_LPFC is not set

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set

# CONFIG_SCSI_DEBUG is not set
@@ -344,9 +362,9 @@ CONFIG_SCSI_QLA2XXX=y 
#

# Fusion MPT device support

#

CONFIG_FUSION=y

CONFIG_FUSION_MAX_SGE=40

# CONFIG_FUSION_CTL is not set

# CONFIG_FUSION is not set

# CONFIG_FUSION_SPI is not set

# CONFIG_FUSION_FC is not set



#

# IEEE 1394 (FireWire) support
@@ -368,12 +386,12 @@ 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

CONFIG_IP_MULTICAST=y

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

# CONFIG_IP_PNP is not set

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set
@@ -386,6 +404,8 @@ CONFIG_IP_MULTICAST=y 
# CONFIG_INET_TUNNEL is not set

# CONFIG_IP_TCPDIAG is not set

# CONFIG_IP_TCPDIAG_IPV6 is not set

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y



#

# IP: Virtual Server Configuration
@@ -405,8 +425,6 @@ CONFIG_NETFILTER=y 
CONFIG_IP_NF_ARPTABLES=y

# CONFIG_IP_NF_ARPFILTER is not set

# CONFIG_IP_NF_ARP_MANGLE is not set

# CONFIG_IP_NF_COMPAT_IPCHAINS is not set

# CONFIG_IP_NF_COMPAT_IPFWADM is not set



#

# SCTP Configuration (EXPERIMENTAL)
@@ -483,7 +501,6 @@ CONFIG_NET_PCI=y 
# CONFIG_DGRS is not set

# CONFIG_EEPRO100 is not set

CONFIG_E100=y

# CONFIG_E100_NAPI is not set

# CONFIG_FEALNX is not set

# CONFIG_NATSEMI is not set

# CONFIG_NE2K_PCI is not set
@@ -505,9 +522,11 @@ CONFIG_E1000=y 
# CONFIG_HAMACHI is not set

# CONFIG_YELLOWFIN is not set

# CONFIG_R8169 is not set

# CONFIG_SKGE is not set

# CONFIG_SK98LIN is not set

# CONFIG_VIA_VELOCITY is not set

CONFIG_TIGON3=y

# CONFIG_BNX2 is not set



#

# Ethernet (10000 Mbit)
@@ -564,18 +583,6 @@ CONFIG_INPUT_JOYDEV=y 
CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_EVBUG is not set



#

# Input I/O drivers

#

# CONFIG_GAMEPORT is not set

CONFIG_SOUND_GAMEPORT=y

CONFIG_SERIO=y

# CONFIG_SERIO_I8042 is not set

# CONFIG_SERIO_SERPORT is not set

# CONFIG_SERIO_CT82C710 is not set

# CONFIG_SERIO_PCIPS2 is not set

# CONFIG_SERIO_RAW is not set



#

# Input Device Drivers

#
@@ -585,6 +592,16 @@ CONFIG_SERIO=y 
# CONFIG_INPUT_TOUCHSCREEN is not set

# CONFIG_INPUT_MISC is not set



#

# Hardware I/O ports

#

CONFIG_SERIO=y

# CONFIG_SERIO_I8042 is not set

# CONFIG_SERIO_SERPORT is not set

# CONFIG_SERIO_PCIPS2 is not set

# CONFIG_SERIO_RAW is not set

# CONFIG_GAMEPORT is not set



#

# Character devices

#
@@ -603,7 +620,6 @@ CONFIG_SERIAL_8250_NR_UARTS=8 
CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

# CONFIG_SERIAL_8250_DETECT_IRQ is not set

# CONFIG_SERIAL_8250_MULTIPORT is not set

# CONFIG_SERIAL_8250_RSA is not set



#
@@ -611,6 +627,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y 
#

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_JSM is not set

CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256
@@ -644,6 +661,12 @@ CONFIG_DRM_RADEON=y 
# CONFIG_DRM_SIS is not set

# CONFIG_RAW_DRIVER is not set

# CONFIG_HPET is not set

# CONFIG_HANGCHECK_TIMER is not set



#

# TPM devices

#

# CONFIG_TCG_TPM is not set



#

# I2C support
@@ -668,6 +691,7 @@ CONFIG_I2C_ALGOPCF=y 
# CONFIG_I2C_AMD8111 is not set

# CONFIG_I2C_I801 is not set

# CONFIG_I2C_I810 is not set

# CONFIG_I2C_PIIX4 is not set

# CONFIG_I2C_ISA is not set

# CONFIG_I2C_NFORCE2 is not set

# CONFIG_I2C_PARPORT_LIGHT is not set
@@ -691,10 +715,14 @@ CONFIG_I2C_ALGOPCF=y 
# CONFIG_SENSORS_ADM1025 is not set

# CONFIG_SENSORS_ADM1026 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ASB100 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_FSCHER is not set

# CONFIG_SENSORS_FSCPOS is not set

# CONFIG_SENSORS_GL518SM is not set

# CONFIG_SENSORS_GL520SM is not set

# CONFIG_SENSORS_IT87 is not set

# CONFIG_SENSORS_LM63 is not set

# CONFIG_SENSORS_LM75 is not set
@@ -705,21 +733,29 @@ CONFIG_I2C_ALGOPCF=y 
# 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

# CONFIG_SENSORS_SIS5595 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_VIA686A is not set

# CONFIG_SENSORS_W83781D is not set

# CONFIG_SENSORS_W83L785TS is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set



#

# Other I2C Chip support

#

# CONFIG_SENSORS_DS1337 is not set

# CONFIG_SENSORS_DS1374 is not set

# CONFIG_SENSORS_EEPROM is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set
@@ -746,6 +782,7 @@ CONFIG_VIDEO_DEV=y 
#

# Video Adapters

#

# CONFIG_TUNER_MULTI_I2C is not set

# CONFIG_VIDEO_BT848 is not set

# CONFIG_VIDEO_CPIA is not set

# CONFIG_VIDEO_SAA5246A is not set
@@ -778,6 +815,11 @@ CONFIG_VIDEO_DEV=y 
# Graphics support

#

CONFIG_FB=y

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=y

# CONFIG_FB_TILEBLITTING is not set

# CONFIG_FB_CIRRUS is not set
@@ -785,6 +827,7 @@ CONFIG_FB_MODE_HELPERS=y 
# CONFIG_FB_CYBER2000 is not set

# CONFIG_FB_ASILIANT is not set

# CONFIG_FB_IMSTT is not set

# CONFIG_FB_NVIDIA is not set

# CONFIG_FB_RIVA is not set

# CONFIG_FB_MATROX is not set

# CONFIG_FB_RADEON_OLD is not set
@@ -801,6 +844,7 @@ CONFIG_FB_RADEON_DEBUG=y 
# CONFIG_FB_VOODOO1 is not set

# CONFIG_FB_TRIDENT is not set

# CONFIG_FB_PM3 is not set

# CONFIG_FB_S1D13XXX is not set

# CONFIG_FB_VIRTUAL is not set



#
@@ -820,6 +864,7 @@ CONFIG_LOGO=y 
# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

CONFIG_LOGO_LINUX_CLUT224=y

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Sound
@@ -869,6 +914,8 @@ CONFIG_SND_AC97_CODEC=y 
# CONFIG_SND_CS46XX is not set

# CONFIG_SND_CS4281 is not set

# CONFIG_SND_EMU10K1 is not set

# CONFIG_SND_EMU10K1X is not set

# CONFIG_SND_CA0106 is not set

# CONFIG_SND_KORG1212 is not set

# CONFIG_SND_MIXART is not set

# CONFIG_SND_NM256 is not set
@@ -876,6 +923,7 @@ CONFIG_SND_AC97_CODEC=y 
# CONFIG_SND_RME96 is not set

# CONFIG_SND_RME9652 is not set

# CONFIG_SND_HDSP is not set

# CONFIG_SND_HDSPM is not set

# CONFIG_SND_TRIDENT is not set

# CONFIG_SND_YMFPCI is not set

# CONFIG_SND_ALS4000 is not set
@@ -893,13 +941,14 @@ CONFIG_SND_FM801_TEA575X=y 
# CONFIG_SND_INTEL8X0M is not set

# CONFIG_SND_SONICVIBES is not set

# CONFIG_SND_VIA82XX is not set

# CONFIG_SND_VIA82XX_MODEM is not set

# CONFIG_SND_VX222 is not set

# CONFIG_SND_HDA_INTEL is not set



#

# USB devices

#

# CONFIG_SND_USB_AUDIO is not set

# CONFIG_SND_USB_USX2Y is not set



#

# Open Sound System
@@ -909,6 +958,8 @@ CONFIG_SND_FM801_TEA575X=y 
#

# USB support

#

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB=y

# CONFIG_USB_DEBUG is not set
@@ -920,8 +971,6 @@ CONFIG_USB_BANDWIDTH=y 
# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_SUSPEND is not set

# CONFIG_USB_OTG is not set

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y



#

# USB Host Controller Drivers
@@ -929,7 +978,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y 
CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_SPLIT_ISO is not set

# CONFIG_USB_EHCI_ROOT_HUB_TT is not set

# CONFIG_USB_ISP116X_HCD is not set

CONFIG_USB_OHCI_HCD=y

# CONFIG_USB_OHCI_BIG_ENDIAN is not set

CONFIG_USB_OHCI_LITTLE_ENDIAN=y

CONFIG_USB_UHCI_HCD=y

# CONFIG_USB_SL811_HCD is not set
@@ -947,12 +999,11 @@ CONFIG_USB_UHCI_HCD=y 
#

CONFIG_USB_STORAGE=y

# CONFIG_USB_STORAGE_DEBUG is not set

# 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

# CONFIG_USB_STORAGE_DPCM is not set

# CONFIG_USB_STORAGE_HP8200e is not set

# CONFIG_USB_STORAGE_USBAT is not set

# CONFIG_USB_STORAGE_SDDR09 is not set

# CONFIG_USB_STORAGE_SDDR55 is not set

# CONFIG_USB_STORAGE_JUMPSHOT is not set
@@ -966,9 +1017,11 @@ CONFIG_USB_HIDINPUT=y 
CONFIG_USB_HIDDEV=y

# CONFIG_USB_AIPTEK is not set

# CONFIG_USB_WACOM is not set

# CONFIG_USB_ACECAD is not set

# CONFIG_USB_KBTAB is not set

# CONFIG_USB_POWERMATE is not set

# CONFIG_USB_MTOUCH is not set

# CONFIG_USB_ITMTOUCH is not set

# CONFIG_USB_EGALAX is not set

# CONFIG_USB_XPAD is not set

# CONFIG_USB_ATI_REMOTE is not set
@@ -978,7 +1031,6 @@ CONFIG_USB_HIDDEV=y 
#

# CONFIG_USB_MDC800 is not set

# CONFIG_USB_MICROTEK is not set

# CONFIG_USB_HPUSBSCSI is not set



#

# USB Multimedia devices
@@ -992,6 +1044,7 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_SE401 is not set

# CONFIG_USB_SN9C102 is not set

# CONFIG_USB_STV680 is not set

# CONFIG_USB_PWC is not set



#

# USB Network Adapters
@@ -1001,6 +1054,7 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_PEGASUS is not set

# CONFIG_USB_RTL8150 is not set

# CONFIG_USB_USBNET is not set

CONFIG_USB_MON=y



#

# USB port drivers
@@ -1016,7 +1070,6 @@ CONFIG_USB_HIDDEV=y 
#

# CONFIG_USB_EMI62 is not set

# CONFIG_USB_EMI26 is not set

# CONFIG_USB_TIGL is not set

# CONFIG_USB_AUERSWALD is not set

# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set
@@ -1025,9 +1078,11 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGETKIT is not set

# CONFIG_USB_PHIDGETSERVO is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_SISUSBVGA is not set



#

# USB ATM/DSL drivers

# USB DSL modem support

#



#
@@ -1040,6 +1095,15 @@ CONFIG_USB_HIDDEV=y 
#

# CONFIG_MMC is not set



#

# InfiniBand support

#

# CONFIG_INFINIBAND is not set



#

# SN Devices

#



#

# File systems

#
@@ -1047,6 +1111,7 @@ CONFIG_EXT2_FS=y 
CONFIG_EXT2_FS_XATTR=y

# CONFIG_EXT2_FS_POSIX_ACL is not set

# CONFIG_EXT2_FS_SECURITY is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS_XATTR=y

# CONFIG_EXT3_FS_POSIX_ACL is not set
@@ -1056,6 +1121,10 @@ CONFIG_JBD=y 
CONFIG_FS_MBCACHE=y

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set



#

# XFS support

#

# CONFIG_XFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set
@@ -1089,7 +1158,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" 
CONFIG_PROC_FS=y

CONFIG_PROC_KCORE=y

CONFIG_SYSFS=y

# CONFIG_DEVFS_FS is not set

# CONFIG_DEVPTS_FS_XATTR is not set

CONFIG_TMPFS=y

CONFIG_TMPFS_XATTR=y
@@ -1120,15 +1188,18 @@ CONFIG_RAMFS=y 
#

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set

CONFIG_NFS_V4=y

# CONFIG_NFS_DIRECTIO is not set

CONFIG_NFSD=y

CONFIG_NFSD_V3=y

# CONFIG_NFSD_V3_ACL is not set

# CONFIG_NFSD_V4 is not set

# CONFIG_NFSD_TCP is not set

CONFIG_LOCKD=y

CONFIG_LOCKD_V4=y

CONFIG_EXPORTFS=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

CONFIG_SUNRPC_GSS=y

CONFIG_RPCSEC_GSS_KRB5=y
@@ -1209,6 +1280,8 @@ CONFIG_NLS_UTF8=y 
# CONFIG_CRC_CCITT is not set

CONFIG_CRC32=y

# CONFIG_LIBCRC32C is not set

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y



#

# Profiling support
@@ -1218,14 +1291,18 @@ CONFIG_CRC32=y 
#

# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_LOG_BUF_SHIFT=17

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set

CONFIG_KPROBES=y

CONFIG_IA64_GRANULE_16MB=y

# CONFIG_IA64_GRANULE_64MB is not set

CONFIG_IA64_PRINT_HAZARDS=y
@@ -1252,6 +1329,7 @@ CONFIG_CRYPTO_MD5=y 
# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_TGR192 is not set

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_TWOFISH is not set

arch/ia64/hp/common/sba_iommu.c

+4 −0
Original line number Diff line number Diff line
@@ -156,10 +156,13 @@ 
*/

#define DELAYED_RESOURCE_CNT	64



#define PCI_DEVICE_ID_HP_SX2000_IOC	0x12ec



#define ZX1_IOC_ID	((PCI_DEVICE_ID_HP_ZX1_IOC << 16) | PCI_VENDOR_ID_HP)

#define ZX2_IOC_ID	((PCI_DEVICE_ID_HP_ZX2_IOC << 16) | PCI_VENDOR_ID_HP)

#define REO_IOC_ID	((PCI_DEVICE_ID_HP_REO_IOC << 16) | PCI_VENDOR_ID_HP)

#define SX1000_IOC_ID	((PCI_DEVICE_ID_HP_SX1000_IOC << 16) | PCI_VENDOR_ID_HP)

#define SX2000_IOC_ID	((PCI_DEVICE_ID_HP_SX2000_IOC << 16) | PCI_VENDOR_ID_HP)



#define ZX1_IOC_OFFSET	0x1000	/* ACPI reports SBA, we want IOC */
@@ -1726,6 +1729,7 @@ static struct ioc_iommu ioc_iommu_info[] __initdata = { 
	{ ZX1_IOC_ID, "zx1", ioc_zx1_init },

	{ ZX2_IOC_ID, "zx2", NULL },

	{ SX1000_IOC_ID, "sx1000", NULL },

	{ SX2000_IOC_ID, "sx2000", NULL },

};



static struct ioc * __init

arch/ia64/hp/sim/simserial.c

+11 −5
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/module.h>

#include <linux/serial.h>

#include <linux/serialP.h>

#include <linux/sysrq.h>



#include <asm/irq.h>

#include <asm/hw_irq.h>
@@ -149,12 +150,17 @@ static void receive_chars(struct tty_struct *tty, struct pt_regs *regs) 
				seen_esc = 2;

				continue;

			} else if ( seen_esc == 2 ) {

				if ( ch == 'P' ) show_state();		/* F1 key */

#ifdef CONFIG_KDB

				if ( ch == 'S' )

					kdb(KDB_REASON_KEYBOARD, 0, (kdb_eframe_t) regs);

				if ( ch == 'P' ) /* F1 */

					show_state();

#ifdef CONFIG_MAGIC_SYSRQ

				if ( ch == 'S' ) { /* F4 */

					do

						ch = ia64_ssc(0, 0, 0, 0,

							      SSC_GETCHAR);

					while (!ch);

					handle_sysrq(ch, regs, NULL);

				}

#endif



				seen_esc = 0;

				continue;

			}