diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-05-13 15:10:40 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-05-13 15:10:40 +0000 |
| commit | abd74f86b459f4ac684de4a0f1bf6552d14b105a (patch) | |
| tree | 5e6a8d954a21071671d2dc346bc97c6bb0d8ec3c /target/linux/amazon/files/drivers | |
| parent | 2803206c500fd09cbcb926e9cba7b19b5ae0d9f2 (diff) | |
| download | upstream-abd74f86b459f4ac684de4a0f1bf6552d14b105a.tar.gz upstream-abd74f86b459f4ac684de4a0f1bf6552d14b105a.tar.bz2 upstream-abd74f86b459f4ac684de4a0f1bf6552d14b105a.zip | |
amazon: update amazon target to kernel 3.3
This is just compile tested, my device is currently not working.
SVN-Revision: 31706
Diffstat (limited to 'target/linux/amazon/files/drivers')
| -rw-r--r-- | target/linux/amazon/files/drivers/mtd/maps/amazon.c | 4 | ||||
| -rw-r--r-- | target/linux/amazon/files/drivers/net/ethernet/admmod.c (renamed from target/linux/amazon/files/drivers/net/admmod.c) | 1 | ||||
| -rw-r--r-- | target/linux/amazon/files/drivers/net/ethernet/amazon_sw.c (renamed from target/linux/amazon/files/drivers/net/amazon_sw.c) | 2 | ||||
| -rw-r--r-- | target/linux/amazon/files/drivers/tty/serial/amazon_asc.c (renamed from target/linux/amazon/files/drivers/serial/amazon_asc.c) | 0 | ||||
| -rw-r--r-- | target/linux/amazon/files/drivers/watchdog/amazon_wdt.c | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/target/linux/amazon/files/drivers/mtd/maps/amazon.c b/target/linux/amazon/files/drivers/mtd/maps/amazon.c index 55bfe32372..568f7d828d 100644 --- a/target/linux/amazon/files/drivers/mtd/maps/amazon.c +++ b/target/linux/amazon/files/drivers/mtd/maps/amazon.c @@ -118,7 +118,7 @@ int find_uImage_size(unsigned long start_offset) return temp + 0x40; } -static int __init amazon_mtd_probe(struct platform_device *dev) +static int amazon_mtd_probe(struct platform_device *dev) { unsigned long uimage_size; struct mtd_info *mymtd = NULL; @@ -167,7 +167,7 @@ static int __init amazon_mtd_probe(struct platform_device *dev) amazon_partitions[2].size = mymtd->size - amazon_partitions[2].offset - (2 * mymtd->erasesize); } - add_mtd_partitions(mymtd, parts, 3); + mtd_device_register(mymtd, parts, 3); printk(KERN_INFO "amazon_mtd: added %s flash with %dMB\n", amazon_map.name, ((int)mymtd->size) >> 20); diff --git a/target/linux/amazon/files/drivers/net/admmod.c b/target/linux/amazon/files/drivers/net/ethernet/admmod.c index 473a1f6387..a11ee1d393 100644 --- a/target/linux/amazon/files/drivers/net/admmod.c +++ b/target/linux/amazon/files/drivers/net/ethernet/admmod.c @@ -1245,7 +1245,6 @@ int adm_process_protocol_filter_request (unsigned int cmd, PPROTOCOLFILTER uPROT int adm_process_mac_table_request (unsigned int cmd, PMACENTRY mMACENTRY) { - unsigned int rtval; unsigned int val; //6996i unsigned int control[6] ; //6996i unsigned int status[6] ; //6996i diff --git a/target/linux/amazon/files/drivers/net/amazon_sw.c b/target/linux/amazon/files/drivers/net/ethernet/amazon_sw.c index 54a70622e4..d18b439cea 100644 --- a/target/linux/amazon/files/drivers/net/amazon_sw.c +++ b/target/linux/amazon/files/drivers/net/ethernet/amazon_sw.c @@ -98,7 +98,7 @@ #define ETHERNET_PACKET_DMA_BUFFER_SIZE 1536 /***************************************** Module Parameters *************************************/ -char mode[] = "bridge"; +static char mode[] = "bridge"; module_param_array(mode, charp, NULL, 0); static int timeout = 1 * HZ; diff --git a/target/linux/amazon/files/drivers/serial/amazon_asc.c b/target/linux/amazon/files/drivers/tty/serial/amazon_asc.c index 449208616b..449208616b 100644 --- a/target/linux/amazon/files/drivers/serial/amazon_asc.c +++ b/target/linux/amazon/files/drivers/tty/serial/amazon_asc.c diff --git a/target/linux/amazon/files/drivers/watchdog/amazon_wdt.c b/target/linux/amazon/files/drivers/watchdog/amazon_wdt.c index 89f1e2281c..b18296b794 100644 --- a/target/linux/amazon/files/drivers/watchdog/amazon_wdt.c +++ b/target/linux/amazon/files/drivers/watchdog/amazon_wdt.c @@ -215,7 +215,7 @@ static struct file_operations wdt_fops = { release: wdt_release, }; -static int __init amazon_wdt_probe(struct platform_device *dev) +static int amazon_wdt_probe(struct platform_device *dev) { int result = result = register_chrdev(0, "watchdog", &wdt_fops); |