diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /arch/arm/mach-nomadik | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'arch/arm/mach-nomadik')
| -rw-r--r-- | arch/arm/mach-nomadik/board-nhk8815.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index 9438bf6613a3..ab3712c86d2b 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #define SRC_CR_INIT_MASK 0x00007fff | 38 | #define SRC_CR_INIT_MASK 0x00007fff |
| 39 | #define SRC_CR_INIT_VAL 0x2aaa8000 | 39 | #define SRC_CR_INIT_VAL 0x2aaa8000 |
| 40 | 40 | ||
| 41 | /* These adresses span 16MB, so use three individual pages */ | 41 | /* These addresses span 16MB, so use three individual pages */ |
| 42 | static struct resource nhk8815_nand_resources[] = { | 42 | static struct resource nhk8815_nand_resources[] = { |
| 43 | { | 43 | { |
| 44 | .name = "nand_addr", | 44 | .name = "nand_addr", |