diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:27:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:27:06 +0200 |
| commit | efa4d684d8927428d333f841e37adeedcfe61cfb (patch) | |
| tree | 5c780a94fdfa9557da018a485d7fe884244aaf48 /arch/x86/lib | |
| parent | 45d593bc5ec78e26e3a967517ed7a51f27c8b91f (diff) | |
| parent | 10d63913999fbd5c02a2a8daecf877c24663bdca (diff) | |
| download | barebox-efa4d684d8927428d333f841e37adeedcfe61cfb.tar.gz barebox-efa4d684d8927428d333f841e37adeedcfe61cfb.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
arch/arm/boards/chumby_falconwing/falconwing.c
arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
arch/x86/mach-x86.dox
scripts/setupmbr/setupmbr.c
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/barebox.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/barebox.lds.S b/arch/x86/lib/barebox.lds.S index 05d0f778e5..6cf6b10d1b 100644 --- a/arch/x86/lib/barebox.lds.S +++ b/arch/x86/lib/barebox.lds.S @@ -85,7 +85,7 @@ SECTIONS boot_disk = .; BYTE(0x00); /* boot disk number (provided by the BIOS) - /* information about the persistant environment storage */ + /* information about the persistent environment storage */ . = PATCH_AREA + PATCH_AREA_PERS_START; pers_env_storage = .; LONG(0x00000000); /* LBA start lower */ |