diff --git a/[refs] b/[refs] index dd02149311a2..914c802cb184 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e53f12cc6c43b69f54937f15c5706d83f67c2fdd +refs/heads/master: fb9ba4e95921f71d874beee2d0964fc2322b47a2 diff --git a/trunk/arch/alpha/Kconfig b/trunk/arch/alpha/Kconfig index dbe8c280fea9..1bec55d63ef6 100644 --- a/trunk/arch/alpha/Kconfig +++ b/trunk/arch/alpha/Kconfig @@ -333,11 +333,6 @@ config PCI_SYSCALL config IOMMU_HELPER def_bool PCI -config ALPHA_CORE_AGP - bool - depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL - default y - config ALPHA_NONAME bool depends on ALPHA_BOOK1 || ALPHA_NONAME_CH