[PATCH 3/3][X] UBUNTU: [Config] fix various annotations syntax errors

[Seth Forshee]

Fix up a number of misformated or incorrect annotations.

Properties: no-test-build
Ignore: yes
Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
---
 debian.master/config/annotations | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index fb5c7e78a169..169de1816373 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -44,7 +44,7 @@ CONFIG_ACPI_NFIT                                policy<{'amd64': 'm', 'i386': 'm
 CONFIG_ACPI_NFIT_DEBUG                          policy<{'amd64': 'n', 'i386': 'n'}>
 CONFIG_ACPI_EXTLOG                              policy<{'amd64': 'm', 'i386': 'm'}>
 #
-CONFIG_ACPI_PROCFS_POWER                        mark<DEPRECATED>
+CONFIG_ACPI_PROCFS_POWER                        flag<DEPRECATED>
 CONFIG_ACPI_CUSTOM_METHOD                       mark<ENFORCED> note<SECURITY: allows arbitrary execution>
 CONFIG_ACPI_CUSTOM_DSDT_FILE                    note<might allow hardware damage>
 
@@ -573,7 +573,7 @@ CONFIG_BLK_DEV_UMEM                             note<experimental NVRAM disk dri
 CONFIG_CDROM_PKTCDVD_WCACHE                     mark<DANGEROUS>
 CONFIG_XEN_BLKDEV_FRONTEND                      note<not autoloadable -- XEN paravirt support>
 CONFIG_VIRTIO_BLK                               note<KVM paravirt support -- not autoloadable>
-CONFIG_BLK_DEV_HD                               note<very old disk device support> mark<ANCIENT>
+CONFIG_BLK_DEV_HD                               note<very old disk device support> flag<ANCIENT>
 
 # Menu: Device Drivers >> Block devices >> Parallel port IDE device support
 CONFIG_PARIDE                                   policy<{'amd64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
@@ -4113,7 +4113,7 @@ CONFIG_VMXNET3                                  policy<{'amd64': 'm', 'arm64': '
 CONFIG_FUJITSU_ES                               policy<{'amd64': 'm', 'arm64': 'm', 'i386': 'm'}>
 CONFIG_HYPERV_NET                               policy<{'amd64': 'm', 'i386': 'm'}>
 #
-CONFIG_HIPPI                                    note<DEPRECATED>
+CONFIG_HIPPI                                    flag<DEPRECATED>
 CONFIG_XEN_NETDEV_FRONTEND                      note<not autoloadable -- XEN paravirt support>
 CONFIG_VMXNET3					note<implicitly disabled by upstream stable change for ppc64el (64K pages)>
 CONFIG_DEFXX_MMIO                               flag<REVIEW>
@@ -7076,7 +7076,7 @@ CONFIG_VIRTIO_MMIO                              policy<{'amd64': 'y', 'arm64': '
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
 #
 CONFIG_VIRTIO_MMIO				note<LP#1557689 CONFIG_VIRTIO_MMIO=n for s390x>
-CONFIG_VIRTIO_PCI                               mark<review>
+CONFIG_VIRTIO_PCI                               flag<REVIEW>
 
 # Menu: Device Drivers >> Virtualization drivers
 CONFIG_VIRT_DRIVERS                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
@@ -7345,7 +7345,7 @@ CONFIG_XEN_ACPI_PROCESSOR                       policy<{'amd64': 'y', 'i386': 'y
 CONFIG_XEN_MCE_LOG                              policy<{'amd64': 'y'}>
 CONFIG_XEN_SYMS                                 policy<{'amd64': 'y', 'i386': 'y'}>
 #
-CONFIG_XEN_ACPI_PROCESSOR                       mark<ENFORCED> <boot essential on XEN host>
+CONFIG_XEN_ACPI_PROCESSOR                       mark<ENFORCED> note<boot essential on XEN host>
 
 # Menu: Device Drivers >> Xen driver support >> Xen memory balloon driver
 CONFIG_XEN_BALLOON                              policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y'}>
@@ -8008,7 +8008,7 @@ CONFIG_CGROUP_PERF                              policy<{'amd64': 'y', 'arm64': '
 CONFIG_BLK_CGROUP                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_DEBUG_BLK_CGROUP                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 #
-CONFIG_DEBUG_BLK_CGROUP                         mark<DEBUG>
+CONFIG_DEBUG_BLK_CGROUP                         flag<DEBUG>
 
 # Menu: General setup >> Control Group support >> Group CPU scheduler
 CONFIG_CGROUP_SCHED                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-- 
2.30.2