3.0-git9 snapshot

This commit is contained in:
Josh Boyer 2011-07-27 16:57:48 -04:00
parent 4a2041744e
commit 35ffdcd40e
11 changed files with 35 additions and 13 deletions

View File

@ -140,9 +140,8 @@ diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 60de906..2f2f2e7 100644 index 60de906..2f2f2e7 100644
--- a/drivers/input/misc/Kconfig --- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig
@@ -209,6 +209,19 @@ config INPUT_KEYSPAN_REMOTE help
To compile this driver as a module, choose M here: the module will Say Y here if you need accelerometer to work in polling mode.
be called keyspan_remote.
+config INPUT_APPLEIR +config INPUT_APPLEIR
+ tristate "Apple infrared receiver (built in)" + tristate "Apple infrared receiver (built in)"

View File

@ -734,6 +734,10 @@ CONFIG_FIREWIRE_NOSY=m
# CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set # CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set
# #
# Virtualization support drivers
#
# CONFIG_VIRT_DRIVERS is not set
# Networking support # Networking support
# #
CONFIG_NET=y CONFIG_NET=y
@ -2040,6 +2044,10 @@ CONFIG_INPUT_APPLEIR=m
# CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_AD714X is not set
# CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_PCF8574 is not set
CONFIG_INPUT_MMA8450=m
CONFIG_INPUT_MPU3050=m
CONFIG_INPUT_KXTJ9=m
# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
# #
# Character devices # Character devices
@ -2289,6 +2297,7 @@ CONFIG_SENSORS_LINEAGE=m
CONFIG_SENSORS_LTC4151=m CONFIG_SENSORS_LTC4151=m
CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5627=m
CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX16065=m
CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6642=m
@ -2307,6 +2316,7 @@ CONFIG_SENSORS_MAX8688=m
# CONFIG_BMP085 is not set # CONFIG_BMP085 is not set
# CONFIG_PCH_PHUB is not set # CONFIG_PCH_PHUB is not set
# CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_PCH_UART is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
CONFIG_W1=m CONFIG_W1=m
CONFIG_W1_CON=y CONFIG_W1_CON=y
@ -3645,6 +3655,7 @@ CONFIG_SQUASHFS=m
CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XATTR=y
CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_XZ=y
CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_EMBEDDED is not set # CONFIG_SQUASHFS_EMBEDDED is not set
CONFIG_VXFS_FS=m CONFIG_VXFS_FS=m
# CONFIG_HPFS_FS is not set # CONFIG_HPFS_FS is not set
@ -4193,6 +4204,7 @@ CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_AMS_DELTA is not set # CONFIG_LEDS_AMS_DELTA is not set
# CONFIG_LEDS_LOCOMO is not set # CONFIG_LEDS_LOCOMO is not set
# CONFIG_LEDS_NET48XX is not set # CONFIG_LEDS_NET48XX is not set
# CONFIG_LEDS_NET5501 is not set
# CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_BD2802 is not set # CONFIG_LEDS_BD2802 is not set
@ -4245,6 +4257,7 @@ CONFIG_FUNCTION_TRACER=y
CONFIG_STACK_TRACER=y CONFIG_STACK_TRACER=y
CONFIG_KPROBES=y CONFIG_KPROBES=y
CONFIG_JUMP_LABEL=y
CONFIG_OPTPROBES=y CONFIG_OPTPROBES=y
# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
@ -4657,6 +4670,7 @@ CONFIG_PN544_NFC=m
CONFIG_NFC_PN533=m CONFIG_NFC_PN533=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_ISCSI_TARGET=m
CONFIG_LOOPBACK_TARGET=m CONFIG_LOOPBACK_TARGET=m
# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set # CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m

View File

@ -191,6 +191,7 @@ CONFIG_HP_ILO=m
CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT_GUEST=y
CONFIG_PARAVIRT=y CONFIG_PARAVIRT=y
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_DMAR_DEFAULT_ON=y CONFIG_DMAR_DEFAULT_ON=y

View File

@ -324,6 +324,7 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
# CONFIG_GPIO_SCH is not set # CONFIG_GPIO_SCH is not set
# CONFIG_PPC_MPC512x is not set # CONFIG_PPC_MPC512x is not set
# CONFIG_RTC_DRV_MPC5121 is not set
CONFIG_MPC512X_DMA=m CONFIG_MPC512X_DMA=m

View File

@ -44,6 +44,7 @@ CONFIG_LPARCFG=y
CONFIG_SERIAL_ICOM=m CONFIG_SERIAL_ICOM=m
CONFIG_HVCS=m CONFIG_HVCS=m
CONFIG_HVC_CONSOLE=y CONFIG_HVC_CONSOLE=y
# CONFIG_HVC_OLD_HVSI is not set
CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI=y
CONFIG_THERM_PM72=y CONFIG_THERM_PM72=y
CONFIG_IBMVETH=m CONFIG_IBMVETH=m
@ -174,6 +175,8 @@ CONFIG_PERF_EVENTS=y
CONFIG_EVENT_PROFILE=y CONFIG_EVENT_PROFILE=y
CONFIG_KVM_BOOK3S_64=m CONFIG_KVM_BOOK3S_64=m
#-- Enable _HV once publicly available POWER7 hardware can use it
# CONFIG_KVM_BOOK3S_64_HV is not set
# CONFIG_KVM_EXIT_TIMING is not set # CONFIG_KVM_EXIT_TIMING is not set
#-- bz#607175 #-- bz#607175
@ -190,3 +193,4 @@ CONFIG_IO_EVENT_IRQ=y
CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_AMD=m
CONFIG_BPF_JIT=y CONFIG_BPF_JIT=y
CONFIG_CPU_FREQ_MAPLE=y

View File

@ -236,5 +236,4 @@ CONFIG_STRICT_DEVMEM=y
# CONFIG_WARN_DYNAMIC_STACK is not set # CONFIG_WARN_DYNAMIC_STACK is not set
CONFIG_JUMP_LABEL=y
CONFIG_CRYPTO_GHASH_S390=m CONFIG_CRYPTO_GHASH_S390=m

View File

@ -191,8 +191,6 @@ CONFIG_FB_XVR1000=y
CONFIG_CRYPTO_DEV_NIAGARA2=y CONFIG_CRYPTO_DEV_NIAGARA2=y
CONFIG_JUMP_LABEL=y
# CONFIG_MTD_OF_PARTS is not set # CONFIG_MTD_OF_PARTS is not set
# CONFIG_MTD_PHYSMAP_OF is not set # CONFIG_MTD_PHYSMAP_OF is not set
# CONFIG_MMC_SDHCI_OF is not set # CONFIG_MMC_SDHCI_OF is not set

View File

@ -341,6 +341,7 @@ CONFIG_LGUEST=m
CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT_GUEST=y
CONFIG_PARAVIRT=y CONFIG_PARAVIRT=y
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
# CONFIG_PARAVIRT_DEBUG is not set # CONFIG_PARAVIRT_DEBUG is not set
# PARAVIRT_SPINLOCKS has a 5% perf hit # PARAVIRT_SPINLOCKS has a 5% perf hit
@ -421,7 +422,10 @@ CONFIG_OLPC=y
CONFIG_OLPC_OPENFIRMWARE=y CONFIG_OLPC_OPENFIRMWARE=y
CONFIG_BATTERY_OLPC=y CONFIG_BATTERY_OLPC=y
CONFIG_MOUSE_PS2_OLPC=y CONFIG_MOUSE_PS2_OLPC=y
CONFIG_OLPC_XO1_PM=y
CONFIG_OLPC_XO15_SCI=y
CONFIG_OLPC_XO1_RTC=y
CONFIG_OLPC_XO1_SCI=y
# staging # staging
# CONFIG_FB_OLPC_DCON is not set # CONFIG_FB_OLPC_DCON is not set
@ -536,8 +540,6 @@ CONFIG_X86_RESERVE_LOW=64
CONFIG_PCH_GBE=m CONFIG_PCH_GBE=m
CONFIG_PCH_PHUB=m CONFIG_PCH_PHUB=m
CONFIG_JUMP_LABEL=y
CONFIG_X86_32_IRIS=m CONFIG_X86_32_IRIS=m
CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE=y

View File

@ -285,6 +285,7 @@ CONFIG_KVM_AMD=m
CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT_GUEST=y
CONFIG_PARAVIRT=y CONFIG_PARAVIRT=y
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
# CONFIG_PARAVIRT_DEBUG is not set # CONFIG_PARAVIRT_DEBUG is not set
# PARAVIRT_SPINLOCKS has a 5% perf hit # PARAVIRT_SPINLOCKS has a 5% perf hit
# CONFIG_PARAVIRT_SPINLOCKS is not set # CONFIG_PARAVIRT_SPINLOCKS is not set
@ -296,6 +297,7 @@ CONFIG_XEN=y
# CONFIG_XEN_DEBUG is not set # CONFIG_XEN_DEBUG is not set
CONFIG_XEN_MAX_DOMAIN_MEMORY=32 CONFIG_XEN_MAX_DOMAIN_MEMORY=32
CONFIG_XEN_BALLOON=y CONFIG_XEN_BALLOON=y
CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_SCRUB_PAGES=y
CONFIG_XEN_SAVE_RESTORE=y CONFIG_XEN_SAVE_RESTORE=y
CONFIG_HVC_XEN=y CONFIG_HVC_XEN=y
@ -453,8 +455,6 @@ CONFIG_PCH_PHUB=m
CONFIG_VIDEO_VIA_CAMERA=m CONFIG_VIDEO_VIA_CAMERA=m
CONFIG_JUMP_LABEL=y
CONFIG_HP_ILO=m CONFIG_HP_ILO=m
CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE=y

View File

@ -84,7 +84,7 @@ Summary: The Linux kernel
# The rc snapshot level # The rc snapshot level
%define rcrev 0 %define rcrev 0
# The git snapshot level # The git snapshot level
%define gitrev 3 %define gitrev 9
# Set rpm version accordingly # Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0 %define rpmversion 3.%{upstream_sublevel}.0
%endif %endif
@ -1873,6 +1873,10 @@ fi
# and build. # and build.
%changelog %changelog
* Wed Jul 27 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.0-git9
- Move CONFIG_JUMP_LABEL to config-generic now that powerpc has it too
* Mon Jul 25 2011 Kyle McMartin <kmcmartin@redhat.com> * Mon Jul 25 2011 Kyle McMartin <kmcmartin@redhat.com>
- Linux 3.0-git3 - Linux 3.0-git3
- Drop hda_intel-prealloc-4mb-dmabuffer.patch, set new - Drop hda_intel-prealloc-4mb-dmabuffer.patch, set new

View File

@ -1,2 +1,2 @@
398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2
ce0c7face215619004aeac9c85c36324 patch-3.0-git3.bz2 4e5417eac273458e78fcb380e8996fec patch-3.0-git9.bz2