summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-11-30 16:16:11 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-11-30 16:16:11 +0000
commitb2e9037d31163560b17c6932e39cff025d793725 (patch)
tree47b47096114311da0966fb165585d63ee9ae2b3e
parentc646de67cdaa3d75b7c7d06bfd0e3eb763c50ce5 (diff)
Undo workaround for binutils bug. I'll uploaded fixed tools later.
-rw-r--r--drivers/media/Makefile2
-rw-r--r--drivers/media/happy.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 348687b5f..2e1436549 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -16,6 +16,6 @@ MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
O_TARGET := media.o
-O_OBJS := happy.o $(MEDIAS)
+O_OBJS := $(MEDIAS)
include $(TOPDIR)/Rules.make
diff --git a/drivers/media/happy.c b/drivers/media/happy.c
deleted file mode 100644
index 4954935c1..000000000
--- a/drivers/media/happy.c
+++ /dev/null
@@ -1 +0,0 @@
-/* This is here to keep the linker happy. */