forked from Sricharanti/sricharan
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'pxa/devel' into next/devel2
Conflicts: arch/arm/mach-s3c2416/s3c2416.c
- Loading branch information
Showing
256 changed files
with
1,871 additions
and
1,185 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2460,7 +2460,7 @@ S: Supported | |
F: drivers/infiniband/hw/ehca/ | ||
|
||
EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER | ||
M: Breno Leitao <leitao@linux.vnet.ibm.com> | ||
M: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/net/ehea/ | ||
|
@@ -3313,7 +3313,7 @@ M: David Woodhouse <[email protected]> | |
L: [email protected] | ||
T: git git://git.infradead.org/iommu-2.6.git | ||
S: Supported | ||
F: drivers/pci/intel-iommu.c | ||
F: drivers/iommu/intel-iommu.c | ||
F: include/linux/intel-iommu.h | ||
|
||
INTEL IOP-ADMA DMA DRIVER | ||
|
@@ -6366,15 +6366,14 @@ F: net/ipv4/tcp_lp.c | |
|
||
TEGRA SUPPORT | ||
M: Colin Cross <[email protected]> | ||
M: Erik Gilling <[email protected]> | ||
M: Olof Johansson <[email protected]> | ||
M: Stephen Warren <[email protected]> | ||
L: [email protected] | ||
T: git git://android.git.kernel.org/kernel/tegra.git | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git | ||
S: Supported | ||
F: arch/arm/mach-tegra | ||
|
||
TEHUTI ETHERNET DRIVER | ||
M: Alexander Indenbaum <[email protected]> | ||
M: Andy Gospodarek <[email protected]> | ||
L: [email protected] | ||
S: Supported | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
/* | ||
* linux/arch/arm/mach-mmp/include/mach/sram.h | ||
* | ||
* SRAM Memory Management | ||
* | ||
* Copyright (c) 2011 Marvell Semiconductors Inc. | ||
* | ||
* This program is free software; you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License version 2 as | ||
* published by the Free Software Foundation. | ||
* | ||
*/ | ||
|
||
#ifndef __ASM_ARCH_SRAM_H | ||
#define __ASM_ARCH_SRAM_H | ||
|
||
#include <linux/genalloc.h> | ||
|
||
/* ARBITRARY: SRAM allocations are multiples of this 2^N size */ | ||
#define SRAM_GRANULARITY 512 | ||
|
||
enum sram_type { | ||
MMP_SRAM_UNDEFINED = 0, | ||
MMP_ASRAM, | ||
MMP_ISRAM, | ||
}; | ||
|
||
struct sram_platdata { | ||
char *pool_name; | ||
int granularity; | ||
}; | ||
|
||
extern struct gen_pool *sram_get_gpool(char *pool_name); | ||
|
||
#endif /* __ASM_ARCH_SRAM_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.