[U-Boot-Users] [PATCH 06/11] misc: Clean drivers/misc/Makefile

monstr at seznam.cz
2008-07-14T17:45:40Z

From: Michal Simek <monstr@monstr.eu>

Signed-off-by: Michal Simek <monstr@monstr.eu>
---
drivers/misc/Makefile | 6 +++---
drivers/misc/ali512x.c | 5 -----
drivers/misc/ns87308.c | 4 ----
drivers/misc/status_led.c | 4 ----
4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index fe8d3d8..2e5884b 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -25,9 +25,9 @@ include $(TOPDIR)/config.mk

LIB := $(obj)libmisc.a

-COBJS-y += ali512x.o
-COBJS-y += ns87308.o
-COBJS-y += status_led.o
+COBJS-$(CONFIG_ALI152X) += ali512x.o
+COBJS-$(CFG_NS87308) += ns87308.o
+COBJS-$(CONFIG_STATUS_LED) += status_led.o
COBJS-$(CONFIG_FSL_LAW) += fsl_law.o

COBJS := $(COBJS-y)
diff --git a/drivers/misc/ali512x.c b/drivers/misc/ali512x.c
index 90b45d9..d6a2c1f 100644
--- a/drivers/misc/ali512x.c
+++ b/drivers/misc/ali512x.c
@@ -32,8 +32,6 @@

#include <config.h>

-#ifdef CONFIG_ALI152X
-
#include <common.h>
#include <asm/io.h>
#include <asm/ic/ali512x.h>
@@ -418,6 +416,3 @@ int ali512x_cio_in(int pin)

return data & bit;
}
-
-
-#endif
diff --git a/drivers/misc/ns87308.c b/drivers/misc/ns87308.c
index cf4d359..6642c2e 100644
--- a/drivers/misc/ns87308.c
+++ b/drivers/misc/ns87308.c
@@ -23,8 +23,6 @@

#include <config.h>

-#ifdef CFG_NS87308
-
#include <ns87308.h>

void initialise_ns87308 (void)
@@ -117,5 +115,3 @@ void initialise_ns87308 (void)
PNP_PGCS_CSLINE_CONF(2, CFG_NS87308_CS2_CONF);
#endif
}
-
-#endif
diff --git a/drivers/misc/status_led.c b/drivers/misc/status_led.c
index ddb6c22..4ba3e18 100644
--- a/drivers/misc/status_led.c
+++ b/drivers/misc/status_led.c
@@ -35,8 +35,6 @@

/* ------------------------------------------------------------------------- */

-#ifdef CONFIG_STATUS_LED
-
typedef struct {
led_id_t mask;
int state;
@@ -127,5 +125,3 @@ void status_led_set (int led, int state)
}
__led_set (ld->mask, state);
}
-
-#endif /* CONFIG_STATUS_LED */
--
1.5.4.GIT