diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-10 14:48:02 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-10 14:48:02 -0500 |
| commit | 68c404b18f6fba404b2753622d0459c68ee128ae (patch) | |
| tree | c1ec0bb12f19d91071b461cc2831d9d3dd4c74f3 /arch/arm/mach-at91/include/mach/at91_mci.h | |
| parent | d035c36c58dd9183ad6aa7875dea89893faedb55 (diff) | |
| parent | 6650239a4b01077e80d5a4468562756d77afaa59 (diff) | |
Merge branch 'bugfixes' into nfs-for-2.6.38
Conflicts:
fs/nfs/nfs2xdr.c
fs/nfs/nfs3xdr.c
fs/nfs/nfs4xdr.c
Diffstat (limited to 'arch/arm/mach-at91/include/mach/at91_mci.h')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91_mci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91_mci.h b/arch/arm/mach-at91/include/mach/at91_mci.h index 57f8ee154943..27ac6f550fe3 100644 --- a/arch/arm/mach-at91/include/mach/at91_mci.h +++ b/arch/arm/mach-at91/include/mach/at91_mci.h | |||
| @@ -74,6 +74,8 @@ | |||
| 74 | #define AT91_MCI_TRTYP_BLOCK (0 << 19) | 74 | #define AT91_MCI_TRTYP_BLOCK (0 << 19) |
| 75 | #define AT91_MCI_TRTYP_MULTIPLE (1 << 19) | 75 | #define AT91_MCI_TRTYP_MULTIPLE (1 << 19) |
| 76 | #define AT91_MCI_TRTYP_STREAM (2 << 19) | 76 | #define AT91_MCI_TRTYP_STREAM (2 << 19) |
| 77 | #define AT91_MCI_TRTYP_SDIO_BYTE (4 << 19) | ||
| 78 | #define AT91_MCI_TRTYP_SDIO_BLOCK (5 << 19) | ||
| 77 | 79 | ||
| 78 | #define AT91_MCI_BLKR 0x18 /* Block Register */ | 80 | #define AT91_MCI_BLKR 0x18 /* Block Register */ |
| 79 | #define AT91_MCI_BLKR_BCNT(n) ((0xffff & (n)) << 0) /* Block count */ | 81 | #define AT91_MCI_BLKR_BCNT(n) ((0xffff & (n)) << 0) /* Block count */ |