Skip to content

GitLab

Commit ef4d984a authored by Paul Beesley's avatar Paul Beesley Committed by TrustedFirmware Code Review
Browse files

Merge "GIC-600: Fix include ordering according to the coding style" into integration

parents af1ac83e ac426351
master v2.5 v2.5-rc1 v2.5-rc0 v2.4 v2.4-rc2 v2.4-rc1 v2.4-rc0 v2.3 v2.3-rc2 v2.3-rc1 v2.3-rc0 arm_cca_v0.2 arm_cca_v0.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
+4 -4
drivers/arm/gic/v3/gic600_multichip.c
View file @ ef4d984a
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
*/ */
#include <assert.h> #include <assert.h>
#include <common/debug.h>
#include <drivers/arm/gicv3.h> #include <common/debug.h>
#include <drivers/arm/gic600_multichip.h> #include <drivers/arm/gic600_multichip.h>
#include <drivers/arm/gicv3.h>
#include "gic600_multichip_private.h"
#include "../common/gic_common_private.h" #include "../common/gic_common_private.h"
#include "gic600_multichip_private.h"
#warning "GIC-600 Multichip driver is currently experimental and the API may change in future." #warning "GIC-600 Multichip driver is currently experimental and the API may change in future."
......
plat/arm/board/n1sdp/n1sdp_bl31_setup.c
View file @ ef4d984a
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
#include <platform_def.h> #include <platform_def.h>
#include <common/debug.h>
#include <drivers/arm/css/css_mhu_doorbell.h> #include <drivers/arm/css/css_mhu_doorbell.h>
#include <drivers/arm/css/scmi.h> #include <drivers/arm/css/scmi.h>
#include <drivers/arm/css/sds.h> #include <drivers/arm/css/sds.h>
#include <drivers/arm/gic600_multichip.h> #include <drivers/arm/gic600_multichip.h>
#include <common/debug.h>
#include <lib/mmio.h> #include <lib/mmio.h>
#include <lib/utils.h> #include <lib/utils.h>
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment