Merge pull request #536 from wigyori/cc-sec

[15.05/openwrt.git] / target / linux / brcm2708 / patches-3.18 / 0063-bcm2708-Allow-option-card-devices-to-be-configured-v.patch

diff --git a/target/linux/brcm2708/patches-3.18/0063-bcm2708-Allow-option-card-devices-to-be-configured-v.patch b/target/linux/brcm2708/patches-3.18/0063-bcm2708-Allow-option-card-devices-to-be-configured-v.patch
index c986c84..4e0a191 100644 (file)
--- a/target/linux/brcm2708/patches-3.18/0063-bcm2708-Allow-option-card-devices-to-be-configured-v.patch
+++ b/target/linux/brcm2708/patches-3.18/0063-bcm2708-Allow-option-card-devices-to-be-configured-v.patch
@@ -369,7 +369,7 @@ support code with each new device.
        mmc_of_parse(mmc);
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
-@@ -1086,8 +1086,12 @@ static struct debugfs_blob_wrapper flat_
+@@ -1092,8 +1092,12 @@ static struct debugfs_blob_wrapper flat_
  
  static int __init of_flat_dt_debugfs_export_fdt(void)
  {