diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-03 15:49:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-03 15:49:14 -0700 |
| commit | 87e8b821ed8db3dab03d96cd542e29666bf210aa (patch) | |
| tree | 0027060473aafbbb125655ba027319c8a1a665fc /arch/powerpc/boot/dts/kmeter1.dts | |
| parent | 33cd9dfa3a13e3d8e41aef225a9f98169816723b (diff) | |
| parent | 5e11611a5d22252f3f9c169a3c9377eac0c32033 (diff) | |
| download | blackbird-op-linux-87e8b821ed8db3dab03d96cd542e29666bf210aa.tar.gz blackbird-op-linux-87e8b821ed8db3dab03d96cd542e29666bf210aa.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/powerpc/boot/dts/kmeter1.dts')
| -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 @@ compatible = "cfi-flash"; /* * The Intel P30 chip has 2 non-identical chips on - * one die, so we need to define 2 seperate regions + * one die, so we need to define 2 separate regions * that are scanned by physmap_of independantly. */ reg = <0 0x00000000 0x02000000 |
