Changeset b50b5af2 in mainline for kernel/genarch/Makefile.inc

Timestamp:

2009-08-22T10:48:00Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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) (1 diff)

kernel/genarch/Makefile.inc

@@ -130 +130 @@
 ifeq ($(CONFIG_OFW_TREE),y)
         GENARCH_SOURCES += \
-                genarch/src/ofw/ofw_tree.c \
+                genarch/src/ofw/ofw_tree.c
+endif
+
+ifeq ($(CONFIG_OFW_PCI),y)
+        GENARCH_SOURCES += \
                 genarch/src/ofw/ebus.c \
                 genarch/src/ofw/fhc.c \
                 genarch/src/ofw/pci.c  \
                 genarch/src/ofw/sbus.c \
-                genarch/src/ofw/upa.c 
+                genarch/src/ofw/upa.c
 endif