Changeset 89c57b6 in mainline for kernel/genarch/Makefile.inc

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

88634420

Parents:

cefb126 (diff), 17279ead (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/genarch/Makefile.inc (modified) (2 diffs)

kernel/genarch/Makefile.inc

@@ -90 +90 @@
 endif
 
+ifeq ($(CONFIG_S3C24XX_IRQC),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/s3c24xx_irqc/s3c24xx_irqc.c
+endif
+
+ifeq ($(CONFIG_S3C24XX_UART),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c
+endif
+
 ifeq ($(CONFIG_Z8530),y)
         GENARCH_SOURCES += \
@@ -110 +120 @@
                 genarch/src/kbrd/kbrd.c \
                 genarch/src/kbrd/scanc_sun.c
-endif
-
-ifeq ($(CONFIG_PL050),y)
-        GENARCH_SOURCES += \
-                genarch/src/kbrd/kbrd_pl050.c \
-                genarch/src/kbrd/scanc_pl050.c
 endif