Index: linux-2.6.23/drivers/serial/Kconfig
===================================================================
---- linux-2.6.23.orig/drivers/serial/Kconfig 2007-12-13 20:41:42.000000000 +0100
-+++ linux-2.6.23/drivers/serial/Kconfig 2007-12-13 20:41:57.000000000 +0100
+--- linux-2.6.23.orig/drivers/serial/Kconfig 2007-12-22 20:21:04.563793426 +0100
++++ linux-2.6.23/drivers/serial/Kconfig 2007-12-22 20:21:08.848037572 +0100
@@ -1259,4 +1259,10 @@
Currently, only 8250 compatible ports are supported, but
others can easily be added.
-+config SERIAL_DANUBE
-+ bool "Danube serial driver"
-+ depends on DANUBE
++config SERIAL_IFXMIPS
++ bool "IFXMips serial driver"
++ depends on IFXMIPS
+ help
-+ Driver for the danubes built in ASC hardware
++ Driver for the ifxmipss built in ASC hardware
+
endmenu
Index: linux-2.6.23/drivers/serial/Makefile
===================================================================
---- linux-2.6.23.orig/drivers/serial/Makefile 2007-12-13 20:41:42.000000000 +0100
-+++ linux-2.6.23/drivers/serial/Makefile 2007-12-13 20:41:57.000000000 +0100
+--- linux-2.6.23.orig/drivers/serial/Makefile 2007-12-22 20:21:04.571793884 +0100
++++ linux-2.6.23/drivers/serial/Makefile 2007-12-22 20:21:08.852037801 +0100
@@ -64,3 +64,4 @@
obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
-+obj-$(CONFIG_SERIAL_DANUBE) += danube_asc.o
++obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o
Index: linux-2.6.23/drivers/mtd/maps/Makefile
===================================================================
---- linux-2.6.23.orig/drivers/mtd/maps/Makefile 2007-12-13 20:41:42.000000000 +0100
-+++ linux-2.6.23/drivers/mtd/maps/Makefile 2007-12-13 20:41:57.000000000 +0100
+--- linux-2.6.23.orig/drivers/mtd/maps/Makefile 2007-12-22 20:21:04.579794340 +0100
++++ linux-2.6.23/drivers/mtd/maps/Makefile 2007-12-22 20:21:08.860038256 +0100
@@ -71,3 +71,4 @@
obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o
obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o
obj-$(CONFIG_MTD_TQM834x) += tqm834x.o
-+obj-$(CONFIG_MTD_DANUBE) += danube.o
++obj-$(CONFIG_MTD_IFXMIPS) += ifxmips.o
Index: linux-2.6.23/drivers/net/Kconfig
===================================================================
---- linux-2.6.23.orig/drivers/net/Kconfig 2007-12-13 20:41:42.000000000 +0100
-+++ linux-2.6.23/drivers/net/Kconfig 2007-12-13 20:41:57.000000000 +0100
+--- linux-2.6.23.orig/drivers/net/Kconfig 2007-12-22 20:21:08.035991295 +0100
++++ linux-2.6.23/drivers/net/Kconfig 2007-12-22 20:21:08.860038256 +0100
@@ -339,6 +339,18 @@
source "drivers/net/arm/Kconfig"
-+config DANUBE_MII0
-+ tristate "Infineon Danube eth0 driver"
-+ depends on DANUBE
++config IFXMIPS_MII0
++ tristate "Infineon IFXMips eth0 driver"
++ depends on IFXMIPS
+ help
-+ Support for the MII0 inside the Danube SOC
++ Support for the MII0 inside the IFXMips SOC
+
-+config DANUBE_MII1
-+ tristate "Infineon Danube eth1 driver"
-+ depends on DANUBE
++config IFXMIPS_MII1
++ tristate "Infineon IFXMips eth1 driver"
++ depends on IFXMIPS
+ help
-+ Support for the MII1 inside the Danube SOC
++ Support for the MII1 inside the IFXMips SOC
+
config AX88796
tristate "ASIX AX88796 NE2000 clone support"
depends on ARM || MIPS
Index: linux-2.6.23/drivers/net/Makefile
===================================================================
---- linux-2.6.23.orig/drivers/net/Makefile 2007-12-13 20:41:42.000000000 +0100
-+++ linux-2.6.23/drivers/net/Makefile 2007-12-13 20:41:57.000000000 +0100
+--- linux-2.6.23.orig/drivers/net/Makefile 2007-12-22 20:21:08.039991524 +0100
++++ linux-2.6.23/drivers/net/Makefile 2007-12-22 20:21:08.860038256 +0100
@@ -208,6 +208,7 @@
obj-$(CONFIG_FEC_8XX) += fec_8xx/
obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
obj-$(CONFIG_MLX4_CORE) += mlx4/
-+obj-$(CONFIG_DANUBE_MII0) += danube_mii0.o
++obj-$(CONFIG_IFXMIPS_MII0) += ifxmips_mii0.o
obj-$(CONFIG_MACB) += macb.o
Index: linux-2.6.23/drivers/char/watchdog/Makefile
===================================================================
---- linux-2.6.23.orig/drivers/char/watchdog/Makefile 2007-12-13 20:41:42.000000000 +0100
-+++ linux-2.6.23/drivers/char/watchdog/Makefile 2007-12-13 20:41:57.000000000 +0100
+--- linux-2.6.23.orig/drivers/char/watchdog/Makefile 2007-12-22 20:21:04.599795479 +0100
++++ linux-2.6.23/drivers/char/watchdog/Makefile 2007-12-22 20:21:08.880039396 +0100
@@ -90,6 +90,7 @@
obj-$(CONFIG_INDYDOG) += indydog.o
obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
-+obj-$(CONFIG_DANUBE_WDT) += danube_wdt.o
++obj-$(CONFIG_IFXMIPS_WDT) += ifxmips_wdt.o
# PARISC Architecture
Index: linux-2.6.23/drivers/char/Makefile
===================================================================
---- linux-2.6.23.orig/drivers/char/Makefile 2007-12-13 20:41:42.000000000 +0100
-+++ linux-2.6.23/drivers/char/Makefile 2007-12-14 22:41:07.000000000 +0100
-@@ -135,3 +135,8 @@
+--- linux-2.6.23.orig/drivers/char/Makefile 2007-12-22 20:21:04.611796164 +0100
++++ linux-2.6.23/drivers/char/Makefile 2007-12-24 15:04:56.849129757 +0100
+@@ -135,3 +135,9 @@
rm $@.tmp
endif
+
-+obj-$(CONFIG_DANUBE_LED) += danube_led.o
-+obj-$(CONFIG_DANUBE_GPIO) += danube_gpio.o
-+obj-$(CONFIG_DANUBE_SSC) += danube_ssc.o
-+obj-$(CONFIG_DANUBE_EEPROM) += danube_eeprom.o
++obj-$(CONFIG_IFXMIPS_LED) += ifxmips_led.o
++obj-$(CONFIG_IFXMIPS_GPIO) += ifxmips_gpio.o
++obj-$(CONFIG_IFXMIPS_SSC) += ifxmips_ssc.o
++obj-$(CONFIG_IFXMIPS_EEPROM) += ifxmips_eeprom.o
++obj-$(CONFIG_IFXMIPS_MEI) += ifxmips_mei_core.o