mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <ahmad@a3f.at>
To: barebox@lists.infradead.org
Cc: mol@pengutronix.de, afa@pengutronix.de
Subject: [PATCH 2/2] ata: fix mismatched header guards
Date: Thu, 22 Aug 2019 08:32:37 +0200	[thread overview]
Message-ID: <20190822063237.15194-2-ahmad@a3f.at> (raw)
In-Reply-To: <20190822063237.15194-1-ahmad@a3f.at>

The header checks for ATA_DISK_H, but defines a different ATA_DISK,
which would lead to compilation errors when included multiple times.
Fix this.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 include/ata_drive.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/ata_drive.h b/include/ata_drive.h
index 11685eef12cf..d61c6f11d4d3 100644
--- a/include/ata_drive.h
+++ b/include/ata_drive.h
@@ -14,7 +14,7 @@
  */
 
 #ifndef ATA_DISK_H
-# define ATA_DISK
+#define ATA_DISK_H
 
 #include <block.h>
 
@@ -197,4 +197,4 @@ struct device_d;
  *       0x400         data      data       16 bit area with 1 kiB in size
  */
 
-#endif /* ATA_DISK */
+#endif /* ATA_DISK_H */
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2019-08-22  6:32 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-22  5:51 [PATCH 00/11] treewide: fix some ARCH=arm clang warnings Ahmad Fatoum
2019-08-22  5:51 ` [PATCH 01/11] linux/kbuild.h: sync with upstream Ahmad Fatoum
2019-08-26 10:35   ` Sascha Hauer
2019-09-09  9:57     ` Ahmad Fatoum
2019-08-22  5:51 ` [PATCH 02/11] ratp: fix use of %hu for printing int Ahmad Fatoum
2019-08-22  5:51 ` [PATCH 03/11] complete: remove unused variable Ahmad Fatoum
2019-08-22  6:08   ` Michael Olbrich
2019-08-22  6:22     ` Ahmad Fatoum
2019-08-22  6:32   ` [PATCH 1/2] fixup! " Ahmad Fatoum
2019-08-22  6:32     ` Ahmad Fatoum [this message]
2019-08-22  5:51 ` [PATCH 04/11] i2c-mux-pca954x: remove use of uninitialized variable Ahmad Fatoum
2019-08-22  5:51 ` [PATCH 05/11] net: phy: mv88e6xxx: remove duplicate member in struct initializer Ahmad Fatoum
2019-08-22  5:51 ` [PATCH 06/11] smc911x: fix inverted poll-for-ready Ahmad Fatoum
2019-08-22  5:51 ` [PATCH 07/11] nvme: use 64 bit types for timeouts even on 32 bit systems Ahmad Fatoum
2019-08-22  5:51 ` [PATCH 08/11] usb: gadget: fsl_udc: remove always-true null pointer checks Ahmad Fatoum
2019-08-22  5:51 ` [PATCH 09/11] commands: mmc_extcsd: describe missing bit Ahmad Fatoum
2019-08-22  5:51 ` [PATCH 10/11] gui: png_lode: fix freeing of uninitialized pointer Ahmad Fatoum
2019-08-22  5:51 ` [PATCH 11/11] fs: fat: fix use of wrong enumeration type Ahmad Fatoum
2019-08-22  6:38 ` [PATCH] ARM: don't use -no-thumb-interwork if unavailable Ahmad Fatoum
2019-08-23  7:20 ` [PATCH 00/11] treewide: fix some ARCH=arm clang warnings Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190822063237.15194-2-ahmad@a3f.at \
    --to=ahmad@a3f.at \
    --cc=afa@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=mol@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox