[PATCH] Makefile: remove drivers/serial/Makefile.rej file

Bo Shen voice.shen at atmel.com
Fri Aug 1 01:18:04 PDT 2014


This file is introduced by commit: 949df9c
Remove it.

Signed-off-by: Bo Shen <voice.shen at 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




More information about the barebox mailing list