diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /include/linux/mm.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 7606d7db96c..692dbae6ffa 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -608,7 +608,7 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma) | |||
| 608 | #endif | 608 | #endif |
| 609 | 609 | ||
| 610 | /* | 610 | /* |
| 611 | * Define the bit shifts to access each section. For non-existant | 611 | * Define the bit shifts to access each section. For non-existent |
| 612 | * sections we define the shift as 0; that plus a 0 mask ensures | 612 | * sections we define the shift as 0; that plus a 0 mask ensures |
| 613 | * the compiler will optimise away reference to them. | 613 | * the compiler will optimise away reference to them. |
| 614 | */ | 614 | */ |