lkml.org 
[lkml]   [2010]   [Jul]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the tip tree with the sh tree
    Hi all,

    Today's linux-next merge of the tip tree got a conflict in
    drivers/Makefile between commit ae9b12c72f831a2f956a5b30fd999f3018c43a89
    ("dmaengine: initialise DMA engine before MMC") from the sh tree and
    commit 592913ecb87a9e06f98ddb55b298f1a66bf94c6b ("time: Kill off
    CONFIG_GENERIC_TIME") from the tip tree.

    Just context changes. I fixed it up (see below) and can carry the fix as
    necessary.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    diff --cc drivers/Makefile
    index 20dcced,ae47344..0000000
    --- a/drivers/Makefile
    +++ b/drivers/Makefile
    @@@ -102,7 -101,10 +102,9 @@@ obj-y += firmware
    obj-$(CONFIG_CRYPTO) += crypto/
    obj-$(CONFIG_SUPERH) += sh/
    obj-$(CONFIG_ARCH_SHMOBILE) += sh/
    - obj-$(CONFIG_GENERIC_TIME) += clocksource/
    + ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
    + obj-y += clocksource/
    + endif
    -obj-$(CONFIG_DMA_ENGINE) += dma/
    obj-$(CONFIG_DCA) += dca/
    obj-$(CONFIG_HID) += hid/
    obj-$(CONFIG_PPC_PS3) += ps3/


    \
     
     \ /
      Last update: 2010-07-28 06:37    [W:0.021 / U:29.840 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site