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

Commit ec329a13 authored by Roland Dreier's avatar Roland Dreier
Browse files

Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)

parents bbf20786 5d7edb3c

.gitignore

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#

# NOTE! Don't add files that are generated in specific

# subdirectories here. Add them in the ".gitignore" file

# in that subdirectory instead.

#

# Normal rules

#

.*

*.o

*.a

*.s

*.ko

*.mod.c



#

# Top-level generic files

#

vmlinux*

System.map

Module.symvers



#

# Generated include files

#

include/asm

include/config

include/linux/autoconf.h

include/linux/compile.h

include/linux/version.h

Documentation/kernel-parameters.txt

+260 −236

File changed.

Preview size limit exceeded, changes collapsed.

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 14

EXTRAVERSION =-rc4

EXTRAVERSION =-rc5

NAME=Affluent Albatross



# *DOCUMENTATION*
@@ -372,7 +372,7 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_ve 
# Files to ignore in find ... statements



RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg \) -prune -o

RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg

export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg



# ===========================================================================

# Rules shared between *config targets and build targets
@@ -660,8 +660,10 @@ quiet_cmd_sysmap = SYSMAP 
# Link of vmlinux

# If CONFIG_KALLSYMS is set .version is already updated

# Generate System.map and verify that the content is consistent



# Use + in front of the vmlinux_version rule to silent warning with make -j2

# First command is ':' to allow us to use + in front of the rule

define rule_vmlinux__

	:

	$(if $(CONFIG_KALLSYMS),,+$(call cmd,vmlinux_version))



	$(call cmd,vmlinux__)

arch/arm/mach-integrator/impd1.c

+8 −7

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-pxa/generic.c

+20 −0
Original line number Diff line number Diff line
@@ -250,6 +250,25 @@ void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info) 
	i2c_device.dev.platform_data = info;

}



static struct resource i2s_resources[] = {

	{

		.start	= 0x40400000,

		.end	= 0x40400083,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= IRQ_I2S,

		.end	= IRQ_I2S,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device i2s_device = {

	.name		= "pxa2xx-i2s",

	.id		= -1,

	.resource	= i2c_resources,

	.num_resources	= ARRAY_SIZE(i2s_resources),

};



static struct platform_device *devices[] __initdata = {

	&pxamci_device,

	&udc_device,
@@ -258,6 +277,7 @@ static struct platform_device *devices[] __initdata = { 
	&btuart_device,

	&stuart_device,

	&i2c_device,

	&i2s_device,

};



static int __init pxa_init(void)