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

Commit fc90ec86 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'fbdev/panning-fixes'

parents d521dd94 e6c4d3d4

Documentation/md.txt

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ also have 
   sync_min

   sync_max

     The two values, given as numbers of sectors, indicate a range

     withing the array where 'check'/'repair' will operate. Must be

     within the array where 'check'/'repair' will operate. Must be

     a multiple of chunk_size. When it reaches "sync_max" it will

     pause, rather than complete.

     You can use 'select' or 'poll' on "sync_completed" to wait for

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1739,7 +1739,7 @@ S: Supported 
F:	drivers/net/enic/



CIRRUS LOGIC EP93XX ETHERNET DRIVER

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Hartley Sweeten <hsweeten@visionengravers.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/arm/ep93xx_eth.c
@@ -1889,7 +1889,6 @@ L: cpufreq@vger.kernel.org 
W:	http://www.codemonkey.org.uk/projects/cpufreq/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git

S:	Maintained

F:	arch/x86/kernel/cpu/cpufreq/

F:	drivers/cpufreq/

F:	include/linux/cpufreq.h
@@ -4945,6 +4944,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.gi 
F:	drivers/input/serio/i8042-unicore32io.h

F:	drivers/i2c/busses/i2c-puv3.c

F:	drivers/video/fb-puv3.c

F:	drivers/rtc/rtc-puv3.c



PMC SIERRA MaxRAID DRIVER

M:	Anil Ravindranath <anil_ravindranath@pmc-sierra.com>

Makefile

+4 −14
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME = Sneaky Weasel



# *DOCUMENTATION*
@@ -378,7 +378,7 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds 


# Read KERNELRELEASE from include/config/kernel.release (if it exists)

KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)

KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)



export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION

export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
@@ -1005,7 +1005,7 @@ endef 


define filechk_version.h

	(echo \#define LINUX_VERSION_CODE $(shell                             \

	expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + $(SUBLEVEL));     \

	expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL));    \

	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)

endef
@@ -1110,11 +1110,6 @@ modules_install: _modinst_ _modinst_post 


PHONY += _modinst_

_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";\

		sleep 1; \

	fi

	@rm -rf $(MODLIB)/kernel

	@rm -f $(MODLIB)/source

	@mkdir -p $(MODLIB)/kernel
@@ -1531,12 +1526,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) 


# Run depmod only if we have System.map and depmod is executable

quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)

      cmd_depmod = \

	if [ -r System.map -a -x $(DEPMOD) ]; then                              \

		$(DEPMOD) -ae -F System.map                                     \

		$(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) )     \

		$(KERNELRELEASE);                                               \

	fi

      cmd_depmod = $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE)



# Create temporary dir for module support files

# clean it up only when building all modules

arch/arm/mach-ep93xx/core.c

+5 −1
Original line number Diff line number Diff line
@@ -402,11 +402,15 @@ static struct resource ep93xx_eth_resource[] = { 
	}

};



static u64 ep93xx_eth_dma_mask = DMA_BIT_MASK(32);



static struct platform_device ep93xx_eth_device = {

	.name		= "ep93xx-eth",

	.id		= -1,

	.dev		= {

		.platform_data		= &ep93xx_eth_data,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.dma_mask		= &ep93xx_eth_dma_mask,

	},

	.num_resources	= ARRAY_SIZE(ep93xx_eth_resource),

	.resource	= ep93xx_eth_resource,

arch/arm/mach-exynos4/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ config EXYNOS4_SETUP_FIMC 
	help

	  Common setup code for the camera interfaces.



config EXYNOS4_SETUP_USB_PHY

	bool

	help

	  Common setup code for USB PHY controller



# machine support



menu "EXYNOS4 Machines"
@@ -176,6 +181,7 @@ config MACH_NURI 
	select EXYNOS4_SETUP_I2C3

	select EXYNOS4_SETUP_I2C5

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select SAMSUNG_DEV_PWM

	help

	  Machine support for Samsung Mobile NURI Board.