Merge branch 'for_2.6.35rc' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus (41bd03ba) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/ABI/testing/sysfs-bus-pci

+0 −40

Original line number	Diff line number	Diff line
		@@ -133,46 +133,6 @@ Description:
		The symbolic link points to the PCI device sysfs entry of the
		Physical Function this device associates with.


		What: /sys/bus/pci/slots/...
		Date: April 2005 (possibly older)
		KernelVersion: 2.6.12 (possibly older)
		Contact: linux-pci@vger.kernel.org
		Description:
		When the appropriate driver is loaded, it will create a
		directory per claimed physical PCI slot in
		/sys/bus/pci/slots/. The names of these directories are
		specific to the driver, which in turn, are specific to the
		platform, but in general, should match the label on the
		machine's physical chassis.

		The drivers that can create slot directories include the
		PCI hotplug drivers, and as of 2.6.27, the pci_slot driver.

		The slot directories contain, at a minimum, a file named
		'address' which contains the PCI bus:device:function tuple.
		Other files may appear as well, but are specific to the
		driver.

		What: /sys/bus/pci/slots/.../function[0-7]
		Date: March 2010
		KernelVersion: 2.6.35
		Contact: linux-pci@vger.kernel.org
		Description:
		If PCI slot directories (as described above) are created,
		and the physical slot is actually populated with a device,
		symbolic links in the slot directory pointing to the
		device's PCI functions are created as well.

		What: /sys/bus/pci/devices/.../slot
		Date: March 2010
		KernelVersion: 2.6.35
		Contact: linux-pci@vger.kernel.org
		Description:
		If PCI slot directories (as described above) are created,
		a symbolic link pointing to the slot directory will be
		created as well.

		What: /sys/bus/pci/slots/.../module
		Date: June 2009
		Contact: linux-pci@vger.kernel.org

MAINTAINERS

+1 −4

Original line number	Diff line number	Diff line
		@@ -2978,7 +2978,6 @@ F: drivers/net/ixgb/
		F: drivers/net/ixgbe/

		INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
		M: Zhu Yi <yi.zhu@intel.com>
		M: Reinette Chatre <reinette.chatre@intel.com>
		M: Intel Linux Wireless <ilw@linux.intel.com>
		L: linux-wireless@vger.kernel.org
		@@ -2988,7 +2987,6 @@ F: Documentation/networking/README.ipw2100
		F: drivers/net/wireless/ipw2x00/ipw2100.*

		INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
		M: Zhu Yi <yi.zhu@intel.com>
		M: Reinette Chatre <reinette.chatre@intel.com>
		M: Intel Linux Wireless <ilw@linux.intel.com>
		L: linux-wireless@vger.kernel.org
		@@ -3019,8 +3017,8 @@ F: drivers/net/wimax/i2400m/
		F: include/linux/wimax/i2400m.h

		INTEL WIRELESS WIFI LINK (iwlwifi)
		M: Zhu Yi <yi.zhu@intel.com>
		M: Reinette Chatre <reinette.chatre@intel.com>
		M: Wey-Yi Guy <wey-yi.w.guy@intel.com>
		M: Intel Linux Wireless <ilw@linux.intel.com>
		L: linux-wireless@vger.kernel.org
		W: http://intellinuxwireless.org
		@@ -3030,7 +3028,6 @@ F: drivers/net/wireless/iwlwifi/

		INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
		M: Samuel Ortiz <samuel.ortiz@intel.com>
		M: Zhu Yi <yi.zhu@intel.com>
		M: Intel Linux Wireless <ilw@linux.intel.com>
		L: linux-wireless@vger.kernel.org
		S: Supported

Makefile

+3 −3

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 35
		EXTRAVERSION = -rc2
		EXTRAVERSION = -rc3
		NAME = Sheep on Meth

		# DOCUMENTATION
		@@ -1095,7 +1095,7 @@ all: modules
		# using awk while concatenating to the final file.

		PHONY += modules
		modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
		modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
		$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
		@$(kecho) ' Building modules, stage 2.';
		$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
		@@ -1117,7 +1117,7 @@ PHONY += modules_install
		modules_install: _modinst_ _modinst_post

		PHONY += _modinst_
		_modinst_: modules.builtin
		_modinst_:
		@if [ -z "`$(DEPMOD) -V 2>/dev/null \| grep module-init-tools`" ]; then \
		echo "Warning: you may need to install module-init-tools"; \
		echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\

arch/arm/common/sa1111.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -951,8 +951,6 @@ static int sa1111_resume(struct platform_device *dev)
		if (!save)
		return 0;

		spin_lock_irqsave(&sachip->lock, flags);

		/*
		* Ensure that the SA1111 is still here.
		* FIXME: shouldn't do this here.
		@@ -969,6 +967,13 @@ static int sa1111_resume(struct platform_device *dev)
		* First of all, wake up the chip.
		*/
		sa1111_wake(sachip);

		/*
		* Only lock for write ops. Also, sa1111_wake must be called with
		* released spinlock!
		*/
		spin_lock_irqsave(&sachip->lock, flags);

		sa1111_writel(0, sachip->base + SA1111_INTC + SA1111_INTEN0);
		sa1111_writel(0, sachip->base + SA1111_INTC + SA1111_INTEN1);

arch/arm/mach-msm/dma.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#include <linux/err.h>
		#include <linux/io.h>
		#include <linux/interrupt.h>
		#include <linux/completion.h>
		#include <mach/dma.h>

		#define MSM_DMOV_CHANNEL_COUNT 16