From: Bo Shen <voice.shen@atmel.com>
To: s.hauer@pengutronix.de
Cc: barebox@lists.infradead.org
Subject: [PATCH] Makefile: remove drivers/serial/Makefile.rej file
Date: Fri, 1 Aug 2014 16:18:04 +0800 [thread overview]
Message-ID: <1406881084-4256-1-git-send-email-voice.shen@atmel.com> (raw)
This file is introduced by commit: 949df9c
Remove it.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
---
This patch is base on the next branch.
drivers/serial/Makefile.rej | 7 -------
1 file changed, 7 deletions(-)
delete mode 100644 drivers/serial/Makefile.rej
diff --git a/drivers/serial/Makefile.rej b/drivers/serial/Makefile.rej
deleted file mode 100644
index 3c4cd01..0000000
--- a/drivers/serial/Makefile.rej
+++ /dev/null
@@ -1,7 +0,0 @@
---- drivers/serial/Makefile
-+++ drivers/serial/Makefile
-@@ -19,3 +19,4 @@
- obj-$(CONFIG_DRIVER_SERIAL_AUART) += serial_auart.o
- obj-$(CONFIG_DRIVER_SERIAL_CADENCE) += serial_cadence.o
- obj-$(CONFIG_DRIVER_SERIAL_EFI_STDIO) += efi-stdio.o
-+obj-$(CONFIG_DRIVER_SERIAL_DIGIC) += serial_digic.o
--
1.8.5.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
reply other threads:[~2014-08-01 8:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1406881084-4256-1-git-send-email-voice.shen@atmel.com \
--to=voice.shen@atmel.com \
--cc=barebox@lists.infradead.org \
--cc=s.hauer@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