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/powerpc/boot | |
| 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/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/dts/kmeter1.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/kmeter1.dts b/arch/powerpc/boot/dts/kmeter1.dts index 65b8b4f27efe..d8b5d12fb663 100644 --- a/arch/powerpc/boot/dts/kmeter1.dts +++ b/arch/powerpc/boot/dts/kmeter1.dts | |||
| @@ -490,7 +490,7 @@ | |||
| 490 | compatible = "cfi-flash"; | 490 | compatible = "cfi-flash"; |
| 491 | /* | 491 | /* |
| 492 | * The Intel P30 chip has 2 non-identical chips on | 492 | * The Intel P30 chip has 2 non-identical chips on |
| 493 | * one die, so we need to define 2 seperate regions | 493 | * one die, so we need to define 2 separate regions |
| 494 | * that are scanned by physmap_of independantly. | 494 | * that are scanned by physmap_of independantly. |
| 495 | */ | 495 | */ |
| 496 | reg = <0 0x00000000 0x02000000 | 496 | reg = <0 0x00000000 0x02000000 |