patch-2.3.26 linux/drivers/char/Makefile

• Lines: 61
• Date: Tue Nov 2 21:35:46 1999
• Orig file: v2.3.25/linux/drivers/char/Makefile
• Orig date: Mon Nov 1 13:56:26 1999

diff -u --recursive --new-file v2.3.25/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -322,6 +322,10 @@
 
 ifeq ($(CONFIG_RTC),y)
 O_OBJS += rtc.o
+else
+  ifeq ($(CONFIG_RTC),m)
+    M_OBJS += rtc.o
+  endif
 endif
 
 ifeq ($(CONFIG_NVRAM),y)
@@ -362,16 +366,6 @@
   endif
 endif
 
-ifeq ($(CONFIG_VIDEO_SAA5249),y)
-O_OBJS += saa5249.o
-L_I2C=y
-else
-  ifeq ($(CONFIG_VIDEO_SAA5249),m)
-    M_OBJS += saa5249.o
-    M_I2C=y
-  endif
-endif
-
 ifeq ($(CONFIG_I2C_PARPORT),y)
 O_OBJS += i2c-parport.o
 L_I2C = y
@@ -382,11 +376,13 @@
   endif
 endif
 
-ifeq ($(CONFIG_VIDEO_BWQCAM),y)
-O_OBJS += bw-qcam.o
+ifeq ($(CONFIG_VIDEO_SAA5249),y)
+O_OBJS += saa5249.o
+L_I2C=y
 else
-  ifeq ($(CONFIG_VIDEO_BWQCAM),m)
-    M_OBJS += bw-qcam.o
+  ifeq ($(CONFIG_VIDEO_SAA5249),m)
+    M_OBJS += saa5249.o
+    M_I2C=y
   endif
 endif
 
@@ -395,6 +391,14 @@
 else
   ifeq ($(CONFIG_VIDEO_CQCAM),m)
     M_OBJS += c-qcam.o
+  endif
+endif
+
+ifeq ($(CONFIG_VIDEO_BWQCAM),y)
+O_OBJS += bw-qcam.o
+else
+  ifeq ($(CONFIG_VIDEO_BWQCAM),m)
+    M_OBJS += bw-qcam.o
   endif
 endif