* include/grub/pci.h: Move enums into no-asm part.

diff --git a/ChangeLog b/ChangeLog
index 4cfd492451899c8c6fc981d0a206e642ec01bf03..59fd5ae63e4c079fc836ce4e2be11ec61be5a4ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/pci.h: Move enums into no-asm part.
+
 2012-05-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/fs/bfs.c (bfs_strcmp) [MODE_AFS]: Use signed comparison.

diff --git a/include/grub/pci.h b/include/grub/pci.h
index 2154d2951e654ab0cb2eeefddec81d0ec7afc9ad..aaf0101f944d056f7377a775d0fff9b7df38518e 100644 (file)
--- a/include/grub/pci.h
+++ b/include/grub/pci.h
@@ -81,6 +81,9 @@
 #define  GRUB_PCI_STATUS_DEVSEL_TIMING_SHIFT 9
 #define  GRUB_PCI_STATUS_DEVSEL_TIMING_MASK 0x0600
 #define  GRUB_PCI_CLASS_SUBCLASS_VGA  0x0300
+
+#ifndef ASM_FILE
+
 enum
   {
     GRUB_PCI_CLASS_NETWORK = 0x02
@@ -95,7 +98,7 @@ enum
     GRUB_PCI_VENDOR_BROADCOM = 0x14e4
   };
 
-#ifndef ASM_FILE
+
 typedef grub_uint32_t grub_pci_id_t;
 
 #ifdef GRUB_MACHINE_EMU