public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
From: Russell King - ARM Linux <linux@arm.linux.org.uk>
To: Linus Walleij <linus.walleij@stericsson.com>
Cc: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	Catalin Marinas <catalin.marinas@arm.com>
Subject: Re: [PATCH 3/3] Move MMCI header to amba include dir
Date: Mon, 21 Sep 2009 16:01:03 +0100	[thread overview]
Message-ID: <20090921150103.GB30821@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1252529727-7957-1-git-send-email-linus.walleij@stericsson.com>

On Wed, Sep 09, 2009 at 10:55:27PM +0200, Linus Walleij wrote:
> This moves the mmci platform data definition struct away from
> arch/arm/include/asm/mach/mmc.h into the more proper place among
> the other primecells in include/linux/amba/mmci.h and at the same
> time renames it to "mmci.h", and also the struct in this file
> confusingly named mmc_platform_data has been renamed
> mmci_platform_data for clarity.

Not sure what's happened, but this patch appears to conflict with
another, resulting in:

arch/arm/mach-versatile/core.c:372: error: variable 'mmc0_plat_data' has initializer but incomplete type
arch/arm/mach-versatile/core.c:373: error: unknown field 'ocr_mask' specified in initializer
arch/arm/mach-versatile/core.c:373: warning: excess elements in struct initializer
arch/arm/mach-versatile/core.c:373: warning: (near initialization for 'mmc0_plat_data')
arch/arm/mach-versatile/core.c:374: error: unknown field 'status' specified in initializer
arch/arm/mach-versatile/core.c:374: warning: excess elements in struct initializer
arch/arm/mach-versatile/core.c:374: warning: (near initialization for 'mmc0_plat_data')
arch/arm/mach-versatile/core.c:375: error: unknown field 'gpio_wp' specified in initializer
arch/arm/mach-versatile/core.c:375: warning: excess elements in struct initializer
arch/arm/mach-versatile/core.c:375: warning: (near initialization for 'mmc0_plat_data')
arch/arm/mach-versatile/core.c:376: error: unknown field 'gpio_cd' specified in initializer
arch/arm/mach-versatile/core.c:376: warning: excess elements in struct initializer
arch/arm/mach-versatile/core.c:376: warning: (near initialization for 'mmc0_plat_data')

arch/arm/mach-realview/realview_eb.c:40:26: error: asm/mach/mmc.h: No such file or directory
arch/arm/mach-realview/realview_pb1176.c:40:26: error: asm/mach/mmc.h: No such file or directory
arch/arm/mach-realview/realview_pb11mp.c:41:26: error: asm/mach/mmc.h: No such file or directory

so I'm going to drop it for the time being.

  reply	other threads:[~2009-09-21 15:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-09 20:55 [PATCH 3/3] Move MMCI header to amba include dir Linus Walleij
2009-09-21 15:01 ` Russell King - ARM Linux [this message]
2009-09-21 15:11   ` Russell King - ARM Linux
2009-09-22 13:45     ` Linus Walleij

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090921150103.GB30821@n2100.arm.linux.org.uk \
    --to=linux@arm.linux.org.uk \
    --cc=catalin.marinas@arm.com \
    --cc=linus.walleij@stericsson.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-mmc@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox