diff options
author | Leonardo Sandoval <leonardo.sandoval@freescale.com> | 2013-04-11 14:39:32 +0000 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-04-13 14:19:51 -0300 |
commit | a0e486a76af5819ee76ac34e966feb72bd3c48bd (patch) | |
tree | 584b715886f5b356851337dfed661c3c489c46ae | |
parent | 869452daf4fe085d5013905f6a5a6584a0e3a56e (diff) | |
download | meta-fsl-arm-1.3.tar.gz |
linux-imx: imx6qsabrelite: Fix perf tools build1.3
Remove patch hunk which undo the perf tools build fix from Boundary
Devices synchronization patch, which causes build failure. This
commit only affects imx6qsabrelite machine image.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval@freescale.com>
-rw-r--r-- | recipes-kernel/linux/linux-imx-3.0.35/imx6qsabrelite/sync-boundary-changes.patch | 13 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-imx_3.0.35.bb | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/recipes-kernel/linux/linux-imx-3.0.35/imx6qsabrelite/sync-boundary-changes.patch b/recipes-kernel/linux/linux-imx-3.0.35/imx6qsabrelite/sync-boundary-changes.patch index 48cf7a7..ac4fcd0 100644 --- a/recipes-kernel/linux/linux-imx-3.0.35/imx6qsabrelite/sync-boundary-changes.patch +++ b/recipes-kernel/linux/linux-imx-3.0.35/imx6qsabrelite/sync-boundary-changes.patch | |||
@@ -7309,17 +7309,4 @@ index fd05514..45191d1 100644 | |||
7309 | 7309 | ||
7310 | snd_soc_write(codec, SGTL5000_CHIP_DAC_VOL, 0x6060); | 7310 | snd_soc_write(codec, SGTL5000_CHIP_DAC_VOL, 0x6060); |
7311 | snd_soc_write(codec, SGTL5000_CHIP_ANA_ADC_CTRL, | 7311 | snd_soc_write(codec, SGTL5000_CHIP_ANA_ADC_CTRL, |
7312 | diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h | ||
7313 | index 547628e..791f9dd 100644 | ||
7314 | --- a/tools/perf/util/include/linux/compiler.h | ||
7315 | +++ b/tools/perf/util/include/linux/compiler.h | ||
7316 | @@ -5,9 +5,7 @@ | ||
7317 | #define __always_inline inline | ||
7318 | #endif | ||
7319 | #define __user | ||
7320 | -#ifndef __attribute_const__ | ||
7321 | #define __attribute_const__ | ||
7322 | -#endif | ||
7323 | |||
7324 | #define __used __attribute__((__unused__)) | ||
7325 | 7312 | ||
diff --git a/recipes-kernel/linux/linux-imx_3.0.35.bb b/recipes-kernel/linux/linux-imx_3.0.35.bb index b0870a2..4b2f47a 100644 --- a/recipes-kernel/linux/linux-imx_3.0.35.bb +++ b/recipes-kernel/linux/linux-imx_3.0.35.bb | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | include linux-imx.inc | 4 | include linux-imx.inc |
5 | 5 | ||
6 | PR = "${INC_PR}.10" | 6 | PR = "${INC_PR}.11" |
7 | 7 | ||
8 | COMPATIBLE_MACHINE = "(mx6)" | 8 | COMPATIBLE_MACHINE = "(mx6)" |
9 | 9 | ||