Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
cba2fa18
Commit
cba2fa18
authored
Nov 28, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
parents
89a1623d
24117def
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
drivers/mmc/mmc.c
drivers/mmc/mmc.c
+1
-1
include/linux/mmc/protocol.h
include/linux/mmc/protocol.h
+2
-2
No files found.
drivers/mmc/mmc.c
View file @
cba2fa18
...
...
@@ -816,7 +816,7 @@ static void mmc_discover_cards(struct mmc_host *host)
cmd
.
opcode
=
SD_SEND_RELATIVE_ADDR
;
cmd
.
arg
=
0
;
cmd
.
flags
=
MMC_RSP_R
1
;
cmd
.
flags
=
MMC_RSP_R
6
;
err
=
mmc_wait_for_cmd
(
host
,
&
cmd
,
CMD_RETRIES
);
if
(
err
!=
MMC_ERR_NONE
)
...
...
include/linux/mmc/protocol.h
View file @
cba2fa18
...
...
@@ -63,7 +63,7 @@
/* class 5 */
#define MMC_ERASE_GROUP_START 35
/* ac [31:0] data addr R1 */
#define MMC_ERASE_GROUP_END 36
/* ac [31:0] data addr R1 */
#define MMC_ERASE 3
7
/* ac R1b */
#define MMC_ERASE 3
8
/* ac R1b */
/* class 9 */
#define MMC_FAST_IO 39
/* ac <Complex> R4 */
...
...
@@ -74,7 +74,7 @@
/* class 8 */
#define MMC_APP_CMD 55
/* ac [31:16] RCA R1 */
#define MMC_GEN_CMD 56
/* adtc [0] RD/WR R1
b
*/
#define MMC_GEN_CMD 56
/* adtc [0] RD/WR R1
*/
/* SD commands type argument response */
/* class 8 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment