diff options
| author | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2014-07-30 13:53:04 +1000 |
|---|---|---|
| committer | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2014-08-08 03:32:13 +0200 |
| commit | 91810ddf798be6067dd4a42dd4c708573645987d (patch) | |
| tree | fcd3bdb81ecb8316d4a6254171a7b021c647d443 | |
| parent | 62997e0981dddd1ef6b2841fbaee204ed88b9733 (diff) | |
device/oprom/realmode: Sanitize header inclusion
Alphabetise includes to avoid duplication.
Change-Id: I7fa6998cd736bad2bab4a6b1a65d48a21d6220d9
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6415
Tested-by: build bot (Jenkins)
Reviewed-by: Isaac Christensen <isaac.christensen@se-eng.com>
| -rw-r--r-- | src/device/oprom/realmode/x86.c | 22 | ||||
| -rw-r--r-- | src/device/oprom/realmode/x86.h | 2 | ||||
| -rw-r--r-- | src/device/oprom/realmode/x86_interrupts.c | 10 |
3 files changed, 18 insertions, 16 deletions
diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c index 7dec2587bf..fc3c40c789 100644 --- a/src/device/oprom/realmode/x86.c +++ b/src/device/oprom/realmode/x86.c @@ -18,26 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <device/pci.h> -#include <string.h> - #include <arch/io.h> +#include <arch/interrupt.h> #include <arch/registers.h> -#include <cpu/amd/lxdef.h> -#include <cpu/amd/vr.h> +#include <boot/coreboot_tables.h> #include <cbfs.h> #include <console/console.h> -#include <arch/interrupt.h> -#include <cbfs.h> +#include <cpu/amd/lxdef.h> +#include <cpu/amd/vr.h> #include <delay.h> +#include <device/pci.h> +#include <device/pci_ids.h> +#include <lib/jpeg.h> #include <pc80/i8259.h> -#include "x86.h" +#include <string.h> #include <vbe.h> -#include <lib/jpeg.h> + /* we use x86emu's register file representation */ #include <x86emu/regs.h> -#include <boot/coreboot_tables.h> -#include <device/pci_ids.h> + +#include "x86.h" /* The following symbols cannot be used directly. They need to be fixed up * to point to the correct address location after the code has been copied diff --git a/src/device/oprom/realmode/x86.h b/src/device/oprom/realmode/x86.h index a811a5621e..a0c7a9002c 100644 --- a/src/device/oprom/realmode/x86.h +++ b/src/device/oprom/realmode/x86.h @@ -52,4 +52,4 @@ int int12_handler(void); int int16_handler(void); int int1a_handler(void); -#endif +#endif /* __DEVICE_OPROM_REALMODE_X86_H__ */ diff --git a/src/device/oprom/realmode/x86_interrupts.c b/src/device/oprom/realmode/x86_interrupts.c index 1ee6979696..56a9b1b5df 100644 --- a/src/device/oprom/realmode/x86_interrupts.c +++ b/src/device/oprom/realmode/x86_interrupts.c @@ -19,17 +19,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <arch/io.h> +#include <arch/registers.h> +#include <console/console.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> #include <string.h> -#include <console/console.h> -#include <arch/io.h> -#include <arch/registers.h> -#include "x86.h" + /* we use x86emu's register file representation */ #include <x86emu/regs.h> +#include "x86.h" + // errors go in AH. Just set these up so that word assigns // will work. KISS. enum { |