-Index: linux-2.6.22-rc6/drivers/mtd/maps/Kconfig
+Index: linux-2.6.22.1/drivers/mtd/maps/Kconfig
===================================================================
---- linux-2.6.22-rc6.orig/drivers/mtd/maps/Kconfig
-+++ linux-2.6.22-rc6/drivers/mtd/maps/Kconfig
-@@ -620,5 +620,10 @@ config MTD_PLATRAM
+--- linux-2.6.22.1.orig/drivers/mtd/maps/Kconfig
++++ linux-2.6.22.1/drivers/mtd/maps/Kconfig
+@@ -620,5 +620,9 @@ config MTD_PLATRAM
This selection automatically selects the map_ram driver.
+config MTD_ADM5120
-+ tristate "Map driver for ADMtek ADM5120 boards"
++ tristate "Map driver for ADM5120 based boards"
+ depends on MIPS_ADM5120
-+ select MTD_CFI_AMDSTD
+
endmenu
-Index: linux-2.6.22-rc6/drivers/mtd/maps/Makefile
+Index: linux-2.6.22.1/drivers/mtd/maps/Makefile
===================================================================
---- linux-2.6.22-rc6.orig/drivers/mtd/maps/Makefile
-+++ linux-2.6.22-rc6/drivers/mtd/maps/Makefile
+--- linux-2.6.22.1.orig/drivers/mtd/maps/Makefile
++++ linux-2.6.22.1/drivers/mtd/maps/Makefile
@@ -47,6 +47,7 @@ obj-$(CONFIG_MTD_OCELOT) += ocelot.o
obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
obj-$(CONFIG_MTD_PCI) += pci.o
obj-$(CONFIG_MTD_ALCHEMY) += alchemy-flash.o
-+obj-$(CONFIG_MTD_ADM5120) += adm5120_mtd.o
++obj-$(CONFIG_MTD_ADM5120) += adm5120-flash.o
obj-$(CONFIG_MTD_LASAT) += lasat.o
obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o
obj-$(CONFIG_MTD_EDB7312) += edb7312.o