diff options
| author | dim <dim@FreeBSD.org> | 2016-02-11 20:07:09 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-02-11 20:07:09 +0000 |
| commit | afa214d26dae14a294ff215b5a55e9acaf67d18f (patch) | |
| tree | d5418788f5368ac552e6ffa543d661830d835dbb /sys/arm/samsung/exynos | |
| parent | 86bef0867f0389dc03d4cd4913f5dee79377226f (diff) | |
| parent | 5183fdd185bc8709354de8b0b88b8925644c2a4b (diff) | |
| download | FreeBSD-src-afa214d26dae14a294ff215b5a55e9acaf67d18f.zip FreeBSD-src-afa214d26dae14a294ff215b5a55e9acaf67d18f.tar.gz | |
Merge ^/head r295351 through r295543.
Diffstat (limited to 'sys/arm/samsung/exynos')
| -rw-r--r-- | sys/arm/samsung/exynos/exynos5_common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/arm/samsung/exynos/exynos5_common.c b/sys/arm/samsung/exynos/exynos5_common.c index 658efc4..8818f04 100644 --- a/sys/arm/samsung/exynos/exynos5_common.c +++ b/sys/arm/samsung/exynos/exynos5_common.c @@ -53,6 +53,7 @@ struct fdt_fixup_entry fdt_fixup_table[] = { { NULL, NULL } }; +#ifndef ARM_INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, int *pol) @@ -71,3 +72,4 @@ fdt_pic_decode_t fdt_pic_table[] = { &fdt_pic_decode_ic, NULL }; +#endif |
