* [PATCH] Makefile: remove drivers/serial/Makefile.rej file
@ 2014-08-01 8:18 Bo Shen
0 siblings, 0 replies; only message in thread
From: Bo Shen @ 2014-08-01 8:18 UTC (permalink / raw)
To: s.hauer; +Cc: barebox
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-08-01 8:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-01 8:18 [PATCH] Makefile: remove drivers/serial/Makefile.rej file Bo Shen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox