diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-10-12 10:12:02 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-10-12 10:12:02 +0000 |
| commit | 68bc88d5e1a9f2c25392e3052a6a5fb6cabec009 (patch) | |
| tree | e143a50dd963a461bfb99f5cabdfb09dbcda2df8 | |
| parent | b26611d3add7af99d474f3468043291f1fcb4c54 (diff) | |
| download | upstream-68bc88d5e1a9f2c25392e3052a6a5fb6cabec009.tar.gz upstream-68bc88d5e1a9f2c25392e3052a6a5fb6cabec009.tar.bz2 upstream-68bc88d5e1a9f2c25392e3052a6a5fb6cabec009.zip | |
Fix the platform device registration; resync kernel config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9266 3c298f89-4303-0410-b956-a3cf2f4a3e73
4 files changed, 3 insertions, 16 deletions
diff --git a/target/linux/au1000/config-2.6.23 b/target/linux/au1000/config-2.6.23 index bc2904553d..a79b43b872 100644 --- a/target/linux/au1000/config-2.6.23 +++ b/target/linux/au1000/config-2.6.23 @@ -47,7 +47,6 @@ CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_DS1682 is not set CONFIG_DUMMY=m CONFIG_ELF_CORE=y # CONFIG_FIXED_PHY is not set @@ -70,7 +69,6 @@ CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALGOPCF=m CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_TAOS_EVM is not set # CONFIG_IDE is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_LEDS_GPIO=y @@ -181,7 +179,6 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_PROC_FS is not set CONFIG_SCSI_WAIT_SCAN=m -# CONFIG_SENSORS_TSL2550 is not set CONFIG_SERIAL_8250_AU1X00=y # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_NR_UARTS=4 diff --git a/target/linux/au1000/files/arch/mips/au1000/mtx-1/platform.c b/target/linux/au1000/files/arch/mips/au1000/mtx-1/platform.c index 529595fcd4..5c7fe53541 100644 --- a/target/linux/au1000/files/arch/mips/au1000/mtx-1/platform.c +++ b/target/linux/au1000/files/arch/mips/au1000/mtx-1/platform.c @@ -70,5 +70,5 @@ static int __init mtx1_register_devices(void) return platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs)); } -arch_initcall(mtx1_register_devices); +module_init(mtx1_register_devices); diff --git a/target/linux/au1000/patches/002-platform_devices.patch b/target/linux/au1000/patches/002-platform_devices.patch deleted file mode 100644 index 193b5001dc..0000000000 --- a/target/linux/au1000/patches/002-platform_devices.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/arch/mips/au1000/mtx-1/Makefile b/arch/mips/au1000/mtx-1/Makefile -index 764bf9f..4d1b8d2 100644 ---- a/arch/mips/au1000/mtx-1/Makefile -+++ b/arch/mips/au1000/mtx-1/Makefile -@@ -7,4 +7,4 @@ - # Makefile for 4G Systems MTX-1 board. - # - --lib-y := init.o board_setup.o irqmap.o -+lib-y := init.o board_setup.o irqmap.o platform.o diff --git a/target/linux/au1000/patches/006-mtx1_system_button.patch b/target/linux/au1000/patches/006-mtx1_system_button.patch index 4364a54329..cc452433cf 100644 --- a/target/linux/au1000/patches/006-mtx1_system_button.patch +++ b/target/linux/au1000/patches/006-mtx1_system_button.patch @@ -15,8 +15,8 @@ diff -urN linux-2.6.16.7/arch/mips/au1000/mtx-1/Makefile linux-2.6.16.7.new/arch @@ -8,3 +8,4 @@ # - lib-y := init.o board_setup.o irqmap.o platform.o -+obj-y := mtx-1_sysbtn.o + lib-y := init.o board_setup.o irqmap.o ++obj-y := mtx-1_sysbtn.o platform.o diff -urN linux-2.6.16.7/arch/mips/au1000/mtx-1/mtx-1_sysbtn.c linux-2.6.16.7.new/arch/mips/au1000/mtx-1/mtx-1_sysbtn.c --- linux-2.6.16.7/arch/mips/au1000/mtx-1/mtx-1_sysbtn.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.16.7.new/arch/mips/au1000/mtx-1/mtx-1_sysbtn.c 2006-04-23 14:01:17.000000000 +0200 |