diff options
author | Pierre Ossman <drzeus@drzeus.cx> | 2007-09-19 12:42:16 -0400 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-09-23 15:28:01 -0400 |
commit | 759bdc7af450404382e937c76722ae8736daef92 (patch) | |
tree | 6c605ba19762d0d0a0afd42f2b4f5d1da99ad90a /include/linux/mmc | |
parent | f9996aee36921e8f1d499de1b2ea380855cf6d97 (diff) |
sdio: store vendor strings
Store vendor strings found in CISTPL_VERS_1 so that function drivers
can access them.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'include/linux/mmc')
-rw-r--r-- | include/linux/mmc/card.h | 2 | ||||
-rw-r--r-- | include/linux/mmc/sdio_func.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index a444431e28bd..0d508ac17d64 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h | |||
@@ -108,6 +108,8 @@ struct mmc_card { | |||
108 | struct sdio_cccr cccr; /* common card info */ | 108 | struct sdio_cccr cccr; /* common card info */ |
109 | struct sdio_cis cis; /* common tuple info */ | 109 | struct sdio_cis cis; /* common tuple info */ |
110 | struct sdio_func *sdio_func[SDIO_MAX_FUNCS]; /* SDIO functions (devices) */ | 110 | struct sdio_func *sdio_func[SDIO_MAX_FUNCS]; /* SDIO functions (devices) */ |
111 | unsigned num_info; /* number of info strings */ | ||
112 | const char **info; /* info strings */ | ||
111 | struct sdio_func_tuple *tuples; /* unknown common tuples */ | 113 | struct sdio_func_tuple *tuples; /* unknown common tuples */ |
112 | }; | 114 | }; |
113 | 115 | ||
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h index da6a96c39776..b050f4d7b41f 100644 --- a/include/linux/mmc/sdio_func.h +++ b/include/linux/mmc/sdio_func.h | |||
@@ -51,6 +51,9 @@ struct sdio_func { | |||
51 | 51 | ||
52 | u8 tmpbuf[4]; /* DMA:able scratch buffer */ | 52 | u8 tmpbuf[4]; /* DMA:able scratch buffer */ |
53 | 53 | ||
54 | unsigned num_info; /* number of info strings */ | ||
55 | const char **info; /* info strings */ | ||
56 | |||
54 | struct sdio_func_tuple *tuples; | 57 | struct sdio_func_tuple *tuples; |
55 | }; | 58 | }; |
56 | 59 | ||