drivers/misc: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index fe8d3d87e96efd02cc61712e116d67974fa1a437..01e0f393d256e549d34561d17ec9fdd67293f6c6 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -25,10 +25,10 @@ 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-$(CONFIG_FSL_LAW) += fsl_law.o
+COBJS-$(CONFIG_NS87308) += ns87308.o
+COBJS-$(CONFIG_STATUS_LED) += status_led.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)

diff --git a/drivers/misc/ali512x.c b/drivers/misc/ali512x.c
index 90b45d98b8cc65886cce63ba24a3267199ea02fb..d6a2c1f57752b9e25d02d89cf67eb0c633138d28 100644 (file)
--- 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 cf4d3595e5da587ff2b8b27ffceabfb1b16530ab..6642c2e072d117337450ece8dd395b9b9f0ea1e6 100644 (file)
--- 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 ddb6c22e89030a935ba28b346045aef351ff54de..4ba3e180440584c15d091e06b4d47ca1c1b5cccc 100644 (file)
--- 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 */

diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 8bbfcf9c0cba8a7115d1c3b5b680791d1e2e36f6..b361eef9a41d8d06b63662843e5362e447a1087e 100644 (file)
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -26,7 +26,7 @@
 #ifdef CFG_NS16550_SERIAL
 
 #include <ns16550.h>
-#ifdef CFG_NS87308
+#ifdef CONFIG_NS87308
 #include <ns87308.h>
 #endif
 
@@ -159,7 +159,7 @@ int serial_init (void)
 {
        int clock_divisor;
 
-#ifdef CFG_NS87308
+#ifdef CONFIG_NS87308
        initialise_ns87308();
 #endif
 

diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h
index 8ec70aa639c1553ac50c03f907e48966b3be0c49..799ce3847261af10e09e48bc321ea87b1b63eb96 100644 (file)
--- a/include/configs/BAB7xx.h
+++ b/include/configs/BAB7xx.h
@@ -346,7 +346,7 @@ extern unsigned char   scsi_sym53c8xx_ccf;
 /*
  * NS87308 Configuration
  */
-#define CFG_NS87308                    /* Nat Semi super-io cntr on ISA bus */
+#define CONFIG_NS87308                    /* Nat Semi super-io cntr on ISA bus */
 #define CFG_NS87308_BADDR_10    1
 #define CFG_NS87308_DEVS        (CFG_NS87308_UART1   | \
                                 CFG_NS87308_UART2   | \

diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index 26dd954c18a7eff11f31506475feed5f11d7f0f5..fea1f6c46a85a91989d6981bdfa5405c3fe36c8f 100644 (file)
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -214,7 +214,7 @@
 /*
  * NS87308 Configuration
  */
-#define CFG_NS87308                    /* Nat Semi super-io controller on ISA bus */
+#define CONFIG_NS87308                 /* Nat Semi super-io controller on ISA bus */
 
 #define CFG_NS87308_BADDR_10   1
 

diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h
index 5bbe3c5919d261faef084d51aa48e40269334abe..c5a57d36c71929aa50db7c9f0ecba6d0d26eae08 100644 (file)
--- a/include/configs/Sandpoint8240.h
+++ b/include/configs/Sandpoint8240.h
@@ -246,7 +246,7 @@
 /*
  * NS87308 Configuration
  */
-#define CFG_NS87308                    /* Nat Semi super-io controller on ISA bus */
+#define CONFIG_NS87308                 /* Nat Semi super-io controller on ISA bus */
 
 #define CFG_NS87308_BADDR_10   1
 

diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h
index a08451eb30b7e3cafc8182765f37b37e6b92daa5..56853140c6ed61f9b423f668330bedf8eb57d9d0 100644 (file)
--- a/include/configs/Sandpoint8245.h
+++ b/include/configs/Sandpoint8245.h
@@ -214,7 +214,7 @@
 /*
  * NS87308 Configuration
  */
-#define CFG_NS87308                    /* Nat Semi super-io controller on ISA bus */
+#define CONFIG_NS87308                 /* Nat Semi super-io controller on ISA bus */
 
 #define CFG_NS87308_BADDR_10   1