diff options
| author | Luiz Souza <luiz@netgate.com> | 2017-09-07 09:10:01 -0500 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-09-07 09:10:01 -0500 |
| commit | e07913821cbee3776b98c98e7e6070b7d94fa6c9 (patch) | |
| tree | 2a8f49eecda339221cf8836f59e6517e7487b22b | |
| parent | d8b79594b340825120630d6db48f5be2755ad2be (diff) | |
| download | FreeBSD-src-e07913821cbee3776b98c98e7e6070b7d94fa6c9.zip FreeBSD-src-e07913821cbee3776b98c98e7e6070b7d94fa6c9.tar.gz | |
Fix a broken merge on ARMADA kernel config.
| -rw-r--r-- | sys/arm/conf/ARMADA38X | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/sys/arm/conf/ARMADA38X b/sys/arm/conf/ARMADA38X index 52adb7c..7395e40 100644 --- a/sys/arm/conf/ARMADA38X +++ b/sys/arm/conf/ARMADA38X @@ -125,28 +125,3 @@ device pl310 # FDT options FDT -<<<<<<< HEAD -======= -options FDT_DTB_STATIC -makeoptions FDT_DTS_FILE=armada-388-clearfog.dts - -# HWPMC -#device hwpmc -#options HWPMC_HOOKS - - -# Watchdog support -# If we don't enable the watchdog driver, the system could potentially -# reboot automatically because the boot loader might have enabled the -# watchdog. -device ti_wdt - -# Mailbox support -device ti_mbox - -# PMU support (for CCNT). -device pmu - -# Netmap provides direct access to TX/RX rings on supported NICs -#device netmap # netmap(4) support ->>>>>>> 839fcfc... Include a pfSense for the ClearFog. |
