← Back to branch summary

~ubuntu-branches/debian/sid/linux-grsec/sid

« back to all changes in this revision

Viewing changes to arch/arm/boot/dts/imx7s.dtsi

  • Committer: Package Import Robot
  • Author(s): Yves-Alexis Perez
  • Date: 2016-12-20 16:13:41 UTC
  • mfrom: (1.1.16)
  • Revision ID: package-import@ubuntu.com-20161220161341-sec3a0j4hvey3kr7
Tags: 4.8.15-1+grsec201612151923+1
http://bugs.debian.org/848803
* Merge changes from src:linux up to 4.8.15-1.
  - include the flex change, fixing FTBFS.                    closes: #848803
* Update grsecurity to 3.1-4.8.15-201612151923.
* debian/patches:
  - bugfix/all/net-handle-no-dst-on-skb-in-icmp6_send.patch disabled,
    already included in grsecurity.
* set CONFIG_LEGACY_VSYSCALL_NONE following src:linux.

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/boot/dts/imx7s.dtsi
640
640
                                reg = <0x30730000 0x10000>;
641
641
                                interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
642
642
                                clocks = <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>,
643
 
                                        <&clks IMX7D_CLK_DUMMY>,
644
 
                                        <&clks IMX7D_CLK_DUMMY>;
645
 
                                clock-names = "pix", "axi", "disp_axi";
 
643
                                        <&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>;
 
644
                                clock-names = "pix", "axi";
646
645
                                status = "disabled";
647
646
                        };
648
647
                };