diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 09:37:56 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 09:37:56 -0500 |
| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /drivers/mmc/pxamci.c | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/mmc/pxamci.c')
| -rw-r--r-- | drivers/mmc/pxamci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index a526698b8c91..471e9f4e0530 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c | |||
| @@ -393,7 +393,7 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
| 393 | host->clkrt, host->cmdat); | 393 | host->clkrt, host->cmdat); |
| 394 | } | 394 | } |
| 395 | 395 | ||
| 396 | static struct mmc_host_ops pxamci_ops = { | 396 | static const struct mmc_host_ops pxamci_ops = { |
| 397 | .request = pxamci_request, | 397 | .request = pxamci_request, |
| 398 | .get_ro = pxamci_get_ro, | 398 | .get_ro = pxamci_get_ro, |
| 399 | .set_ios = pxamci_set_ios, | 399 | .set_ios = pxamci_set_ios, |