diff --git a/[refs] b/[refs] index 9b94754cea0e..c3e890be0cae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 350eaf791bebccb9ad5999351f3e328319545f03 +refs/heads/master: 67faaada1ebcccf29745346f1d7cb5392f46500a diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig index 5b5790f8a816..a5b77811fdf2 100644 --- a/trunk/mm/Kconfig +++ b/trunk/mm/Kconfig @@ -181,12 +181,6 @@ config MIGRATION example on NUMA systems to put pages nearer to the processors accessing the page. -config RESOURCES_64BIT - bool "64 bit Memory and IO resources (EXPERIMENTAL)" if (!64BIT && EXPERIMENTAL) - default 64BIT - help - This option allows memory and IO resources to be 64 bit. - config PHYS_ADDR_T_64BIT def_bool 64BIT || ARCH_PHYS_ADDR_T_64BIT