diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-09-29 15:49:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 15:49:20 +0200 |
| commit | ca3f1a614a1ee90fc67188b375888517f0c151df (patch) | |
| tree | 930c456200793be1ec731e819aa0dd2e4b0b0dbf /target/linux/ar71xx/patches-3.18/737-MIPS-ath79-add-om5p-an-support.patch | |
| parent | d6b3ca24c50047af58135ad3090f7a3a25eee35d (diff) | |
| parent | f9755e28776fdce0c2136492b43380d0eefe3c5a (diff) | |
| download | upstream-ca3f1a614a1ee90fc67188b375888517f0c151df.tar.gz upstream-ca3f1a614a1ee90fc67188b375888517f0c151df.tar.bz2 upstream-ca3f1a614a1ee90fc67188b375888517f0c151df.zip | |
Merge pull request #105 from wigyori/chaos_calmer
CC: openssl security upgrade, sync updates from git.openwrt.org/chaos_calmer
Diffstat (limited to 'target/linux/ar71xx/patches-3.18/737-MIPS-ath79-add-om5p-an-support.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-3.18/737-MIPS-ath79-add-om5p-an-support.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-3.18/737-MIPS-ath79-add-om5p-an-support.patch b/target/linux/ar71xx/patches-3.18/737-MIPS-ath79-add-om5p-an-support.patch index 3fbfba7024..137a09ab50 100644 --- a/target/linux/ar71xx/patches-3.18/737-MIPS-ath79-add-om5p-an-support.patch +++ b/target/linux/ar71xx/patches-3.18/737-MIPS-ath79-add-om5p-an-support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -87,6 +87,7 @@ enum ath79_mach_type { +@@ -88,6 +88,7 @@ enum ath79_mach_type { ATH79_MACH_OM2P_LC, /* OpenMesh OM2P-LC */ ATH79_MACH_OM2Pv2, /* OpenMesh OM2Pv2 */ ATH79_MACH_OM2P, /* OpenMesh OM2P */ @@ -10,7 +10,7 @@ ATH79_MACH_PB42, /* Atheros PB42 */ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -743,6 +743,7 @@ config ATH79_MACH_OM2P +@@ -752,6 +752,7 @@ config ATH79_MACH_OM2P config ATH79_MACH_OM5P bool "OpenMesh OM5P board support" select SOC_AR934X |