diff options
| author | Olof Johansson <olof@lixom.net> | 2016-06-13 23:24:39 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-06-13 23:24:39 +0200 |
| commit | 6c8266009cfdacccc94da39493e2a88b9379b315 (patch) | |
| tree | bb22b94576b778c1c5918044f1bf876da99bf3db /arch/arm/mach-s3c64xx | |
| parent | ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB (diff) | |
| parent | ARM: s3c24xx: Sort cpufreq tables (diff) | |
| download | linux-6c8266009cfdacccc94da39493e2a88b9379b315.tar.xz linux-6c8266009cfdacccc94da39493e2a88b9379b315.zip | |
Merge tag 'samsung-soc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/cleanup
Samsung mach/soc update for v4.8:
1. Minor cleanups.
* tag 'samsung-soc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: s3c24xx: Sort cpufreq tables
ARM: SAMSUNG: Fix typos
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h index f55ccb1ce893..d51873e8f63f 100644 --- a/arch/arm/mach-s3c64xx/include/mach/map.h +++ b/arch/arm/mach-s3c64xx/include/mach/map.h @@ -99,7 +99,7 @@ #define S3C64XX_PA_USB_HSPHY (0x7C100000) -/* compatibiltiy defines. */ +/* compatibility defines. */ #define S3C_PA_TIMER S3C64XX_PA_TIMER #define S3C_PA_HSMMC0 S3C64XX_PA_HSMMC0 #define S3C_PA_HSMMC1 S3C64XX_PA_HSMMC1 |