diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /drivers/mmc/host/sdhci.h | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'drivers/mmc/host/sdhci.h')
| -rw-r--r-- | drivers/mmc/host/sdhci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 7fb02e177a3d..299118de8933 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h | |||
| @@ -187,7 +187,7 @@ struct sdhci_host { | |||
| 187 | struct mmc_request *mrq; /* Current request */ | 187 | struct mmc_request *mrq; /* Current request */ |
| 188 | struct mmc_command *cmd; /* Current command */ | 188 | struct mmc_command *cmd; /* Current command */ |
| 189 | struct mmc_data *data; /* Current data request */ | 189 | struct mmc_data *data; /* Current data request */ |
| 190 | int data_early:1; /* Data finished before cmd */ | 190 | unsigned int data_early:1; /* Data finished before cmd */ |
| 191 | 191 | ||
| 192 | struct scatterlist *cur_sg; /* We're working on this */ | 192 | struct scatterlist *cur_sg; /* We're working on this */ |
| 193 | int num_sg; /* Entries left */ | 193 | int num_sg; /* Entries left */ |