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

Timestamp:

2011-07-05T21:21:36Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5e2aa83, eb66f236

Parents:

3714e79 (diff), f7a55f9 (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

@@ -100 +100 @@
 endif
 
-ifeq ($(CONFIG_Z8530),y)
-        GENARCH_SOURCES += \
-                genarch/src/drivers/z8530/z8530.c
-endif
-
 ifeq ($(CONFIG_VIA_CUDA),y)
         GENARCH_SOURCES += \
@@ -141 +136 @@
         GENARCH_SOURCES += \
                 genarch/src/ofw/ebus.c \
-                genarch/src/ofw/fhc.c \
                 genarch/src/ofw/pci.c  \
                 genarch/src/ofw/sbus.c \