Merge pull request #580 from wigyori/cc-libpcap

[15.05/openwrt.git] / target / linux / brcm2708 / patches-3.18 / 0071-config-Enable-CONFIG_PPS.patch

diff --git a/target/linux/brcm2708/patches-3.18/0071-config-Enable-CONFIG_PPS.patch b/target/linux/brcm2708/patches-3.18/0071-config-Enable-CONFIG_PPS.patch
old mode 100755 (executable)
new mode 100644 (file)
index 4806d7a..47cfbe6
--- a/target/linux/brcm2708/patches-3.18/0071-config-Enable-CONFIG_PPS.patch
+++ b/target/linux/brcm2708/patches-3.18/0071-config-Enable-CONFIG_PPS.patch
@@ -7,8 +7,6 @@ Subject: [PATCH 071/114] config: Enable CONFIG_PPS
  arch/arm/configs/bcmrpi_defconfig | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 2cd8227..36aca2b 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -544,6 +544,9 @@ CONFIG_I2C_BCM2708=m
@@ -21,6 +19,3 @@ index 2cd8227..36aca2b 100644
  CONFIG_GPIO_SYSFS=y
  CONFIG_GPIO_ARIZONA=m
  CONFIG_W1=m
--- 
-1.8.3.2
-