diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 12:26:06 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 12:26:10 +0000 |
| commit | e0e5ce59dc7b2685516219fdf44f01a8d53e0228 (patch) | |
| tree | 3c79c9c95589bba1b54f7c87172fcaa51d67a01b /arch/m68k/include/asm/mcf_pgtable.h | |
| parent | fdc24d4ba20499febb90ff17d3b75674026712f8 (diff) | |
| parent | 6f6ea93705f8519fb53dbc1516abe94d1787f4c4 (diff) | |
| download | blackbird-op-linux-e0e5ce59dc7b2685516219fdf44f01a8d53e0228.tar.gz blackbird-op-linux-e0e5ce59dc7b2685516219fdf44f01a8d53e0228.zip | |
Merge branch 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
* 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6: (7 commits)
ARM: dts: imx6q-sabrelite: add vmmc-supply for usdhc
ARM: dts: imx6q-arm2: add vmmc-supply for usdhc
ARM: dts: imx51-babbage: update mc13892 device
ARM: dts: imx6q-sabrelite: add sgtl5000 audio codec
ARM: dts: imx6q-sabrelite: add 2p5v and 3p3v regulators
ARM i.MX5/6: Add dt support for generic boards
ARM: imx5: generate dtbs for imx5 boards
(update to Linux 3.3-rc5)
Diffstat (limited to 'arch/m68k/include/asm/mcf_pgtable.h')
| -rw-r--r-- | arch/m68k/include/asm/mcf_pgtable.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/mcf_pgtable.h b/arch/m68k/include/asm/mcf_pgtable.h index 756bde4fb4f8..3c793682e5d9 100644 --- a/arch/m68k/include/asm/mcf_pgtable.h +++ b/arch/m68k/include/asm/mcf_pgtable.h @@ -78,7 +78,8 @@ | CF_PAGE_READABLE \ | CF_PAGE_WRITABLE \ | CF_PAGE_EXEC \ - | CF_PAGE_SYSTEM) + | CF_PAGE_SYSTEM \ + | CF_PAGE_SHARED) #define PAGE_COPY __pgprot(CF_PAGE_VALID \ | CF_PAGE_ACCESSED \ |
