diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-02 14:16:37 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-02 14:16:47 +0200 |
| commit | ba67cf5cf2ce10ad86a212b70f8c7c75d93a5016 (patch) | |
| tree | 70242f5927c6d6454bd352ff78f956cfc5238f59 /arch/arm/plat-omap/include/plat/gpmc.h | |
| parent | aff364860aa105b2deacc6f21ec8ef524460e3fc (diff) | |
| parent | 2be19102b71c1a45d37fec50303791daa1a06869 (diff) | |
| download | linux-next-ba67cf5cf2ce10ad86a212b70f8c7c75d93a5016.tar.gz | |
Merge branch 'x86/urgent' into x86-mm
Merge reason: Pick up the following two fix commits.
2be19102b7: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
765af22da8: x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change
Scheduled NUMA init 32/64bit unification changes depend on these.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/arm/plat-omap/include/plat/gpmc.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/gpmc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/gpmc.h b/arch/arm/plat-omap/include/plat/gpmc.h index 12b316165037..1527929b445a 100644 --- a/arch/arm/plat-omap/include/plat/gpmc.h +++ b/arch/arm/plat-omap/include/plat/gpmc.h @@ -90,7 +90,7 @@ enum omap_ecc { /* 1-bit ecc: stored at end of spare area */ OMAP_ECC_HAMMING_CODE_DEFAULT = 0, /* Default, s/w method */ OMAP_ECC_HAMMING_CODE_HW, /* gpmc to detect the error */ - /* 1-bit ecc: stored at begining of spare area as romcode */ + /* 1-bit ecc: stored at beginning of spare area as romcode */ OMAP_ECC_HAMMING_CODE_HW_ROMCODE, /* gpmc method & romcode layout */ }; |