Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] Update mach-types ARM: 5793/1: ARM: Check put_user fail in do_signal when enable OABI_COMPAT MAINTAINERS: add maintainer information for AMBA primecell drivers [ARM] pxa/spitz: fix compile regression on spitz ARM: PNX4008: i2c-pnx: use the same dev_id for request_irq and free_irq [ARM] pxa/cpufreq: fix index assignments for end marker ARM: PNX4008: fix watchdog device driver name [ARM] kmap: fix build errors with DEBUG_HIGHMEM enabled
author: Linus Torvalds <torvalds@linux-foundation.org> 2009-11-30 17:50:01 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2009-11-30 17:50:01 -0500
commit: 07a6d5a49c985ae6111221b93b3a48772cc4b976 (patch)
tree: ab55ca70c64aa8d9d9c8c003092ae9d95d2bfc57
parent: b4297b01198bc2501038bb463b6631f6f3782cc0 (diff)
parent: 3fcca9ac6cbce35b3e81e247d375534117d5f4cd (diff)
9 files changed, 159 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 23d09d78a7b9..c385456caaf0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -512,10 +512,32 @@ W:	http://www.arm.linux.org.uk/
 S:      Maintained
 F:      arch/arm/
+ARM PRIMECELL AACI PL041 DRIVER
+M:      Russell King <linux@arm.linux.org.uk>
+S:      Maintained
+F:      sound/arm/aaci.*
+ARM PRIMECELL CLCD PL110 DRIVER
+M:      Russell King <linux@arm.linux.org.uk>
+S:      Maintained
+F:      drivers/video/amba-clcd.*
+ARM PRIMECELL KMI PL050 DRIVER
+M:      Russell King <linux@arm.linux.org.uk>
+S:      Maintained
+F:      drivers/input/serio/ambakmi.*
+F:      include/linux/amba/kmi.h
 ARM PRIMECELL MMCI PL180/1 DRIVER
 S:      Orphan
 F:      drivers/mmc/host/mmci.*
+ARM PRIMECELL BUS SUPPORT
+M:      Russell King <linux@arm.linux.org.uk>
+S:      Maintained
+F:      drivers/amba/
+F:      include/linux/amba/bus.h
 ARM/ADI ROADRUNNER MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
index d16ec97ec9a9..c019949a5189 100644
--- a/arch/arm/include/asm/kmap_types.h
+++ b/arch/arm/include/asm/kmap_types.h
@@ -22,4 +22,10 @@ enum km_type {
        KM_TYPE_NR
 };
+#ifdef CONFIG_DEBUG_HIGHMEM
+#define KM_NMI          (-1)
+#define KM_NMI_PTE      (-1)
+#define KM_IRQ_PTE      (-1)
+#endif
 #endif
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 2a573d4fea24..e7714f367eb8 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -662,8 +662,12 @@ static void do_signal(struct pt_regs *regs, int syscall)
                                regs->ARM_sp -= 4;
                                usp = (u32 __user *)regs->ARM_sp;
-                                put_user(regs->ARM_pc, usp);
+                                if (put_user(regs->ARM_pc, usp) == 0) {
-                                regs->ARM_pc = KERN_RESTART_CODE;
+                                        regs->ARM_pc = KERN_RESTART_CODE;
+                                } else {
+                                        regs->ARM_sp += 4;
+                                        force_sigsegv(0, current);
+                                }
 #endif
                        }
                }
diff --git a/arch/arm/mach-pxa/cpufreq-pxa2xx.c b/arch/arm/mach-pxa/cpufreq-pxa2xx.c
index 983cc8c20081..9e4d9816726a 100644
--- a/arch/arm/mach-pxa/cpufreq-pxa2xx.c
+++ b/arch/arm/mach-pxa/cpufreq-pxa2xx.c
@@ -447,6 +447,7 @@ static __init int pxa_cpufreq_init(struct cpufreq_policy *policy)
                pxa27x_freq_table[i].frequency = freq;
                pxa27x_freq_table[i].index = i;
        }
+        pxa27x_freq_table[i].index = i;
        pxa27x_freq_table[i].frequency = CPUFREQ_TABLE_END;
        /*
diff --git a/arch/arm/mach-pxa/cpufreq-pxa3xx.c b/arch/arm/mach-pxa/cpufreq-pxa3xx.c
index 67f34a8d8e60..149cdd9aee4d 100644
--- a/arch/arm/mach-pxa/cpufreq-pxa3xx.c
+++ b/arch/arm/mach-pxa/cpufreq-pxa3xx.c
@@ -102,7 +102,7 @@ static int setup_freqs_table(struct cpufreq_policy *policy,
                table[i].index = i;
                table[i].frequency = freqs[i].cpufreq_mhz * 1000;
        }
-        table[num].frequency = i;
+        table[num].index = i;
        table[num].frequency = CPUFREQ_TABLE_END;
        pxa3xx_freqs = freqs;
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 3da45d051743..d98023f55503 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -802,10 +802,12 @@ static void __init spitz_init(void)
 {
        spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON;
+#ifdef CONFIG_MACH_BORZOI
        if (machine_is_borzoi()) {
                sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
                sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
        }
+#endif
        platform_scoop_config = &spitz_pcmcia_config;
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 94be7bb6cb9a..07b976da6174 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
 #
 #   http://www.arm.linux.org.uk/developer/machines/?action=new
 #
-# Last update: Fri Sep 18 21:42:00 2009
+# Last update: Wed Nov 25 22:14:58 2009
 #
 # machine_is_xxx        CONFIG_xxxx             MACH_TYPE_xxx           number
 #
@@ -928,7 +928,7 @@ palmt5			MACH_PALMT5		PALMT5			917
 palmtc                  MACH_PALMTC             PALMTC                  918
 omap_apollon            MACH_OMAP_APOLLON       OMAP_APOLLON            919
 mxc30030evb             MACH_MXC30030EVB        MXC30030EVB             920
-rea_2d                  MACH_REA_2D             REA_2D                  921
+rea_cpu2                MACH_REA_2D             REA_2D                  921
 eti3e524                MACH_TI3E524            TI3E524                 922
 ateb9200                MACH_ATEB9200           ATEB9200                923
 auckland                MACH_AUCKLAND           AUCKLAND                924
@@ -2421,3 +2421,118 @@ liberty			MACH_LIBERTY		LIBERTY			2434
 mh355                   MACH_MH355              MH355                   2435
 pc7802                  MACH_PC7802             PC7802                  2436
 gnet_sgc                MACH_GNET_SGC           GNET_SGC                2437
+einstein15              MACH_EINSTEIN15         EINSTEIN15              2438
+cmpd                    MACH_CMPD               CMPD                    2439
+davinci_hase1           MACH_DAVINCI_HASE1      DAVINCI_HASE1           2440
+lgeincitephone          MACH_LGEINCITEPHONE     LGEINCITEPHONE          2441
+ea313x                  MACH_EA313X             EA313X                  2442
+fwbd_39064              MACH_FWBD_39064         FWBD_39064              2443
+fwbd_390128             MACH_FWBD_390128        FWBD_390128             2444
+pelco_moe               MACH_PELCO_MOE          PELCO_MOE               2445
+minimix27               MACH_MINIMIX27          MINIMIX27               2446
+omap3_thunder           MACH_OMAP3_THUNDER      OMAP3_THUNDER           2447
+passionc                MACH_PASSIONC           PASSIONC                2448
+mx27amata               MACH_MX27AMATA          MX27AMATA               2449
+bgat1                   MACH_BGAT1              BGAT1                   2450
+buzz                    MACH_BUZZ               BUZZ                    2451
+mb9g20                  MACH_MB9G20             MB9G20                  2452
+yushan                  MACH_YUSHAN             YUSHAN                  2453
+lizard                  MACH_LIZARD             LIZARD                  2454
+omap3polycom            MACH_OMAP3POLYCOM       OMAP3POLYCOM            2455
+smdkv210                MACH_SMDKV210           SMDKV210                2456
+bravo                   MACH_BRAVO              BRAVO                   2457
+siogentoo1              MACH_SIOGENTOO1         SIOGENTOO1              2458
+siogentoo2              MACH_SIOGENTOO2         SIOGENTOO2              2459
+sm3k                    MACH_SM3K               SM3K                    2460
+acer_tempo_f900         MACH_ACER_TEMPO_F900    ACER_TEMPO_F900         2461
+sst61vc010_dev          MACH_SST61VC010_DEV     SST61VC010_DEV          2462
+glittertind             MACH_GLITTERTIND        GLITTERTIND             2463
+omap_zoom3              MACH_OMAP_ZOOM3         OMAP_ZOOM3              2464
+omap_3630sdp            MACH_OMAP_3630SDP       OMAP_3630SDP            2465
+cybook2440              MACH_CYBOOK2440         CYBOOK2440              2466
+torino_s                MACH_TORINO_S           TORINO_S                2467
+havana                  MACH_HAVANA             HAVANA                  2468
+beaumont_11             MACH_BEAUMONT_11        BEAUMONT_11             2469
+vanguard                MACH_VANGUARD           VANGUARD                2470
+s5pc110_draco           MACH_S5PC110_DRACO      S5PC110_DRACO           2471
+cartesio_two            MACH_CARTESIO_TWO       CARTESIO_TWO            2472
+aster                   MACH_ASTER              ASTER                   2473
+voguesv210              MACH_VOGUESV210         VOGUESV210              2474
+acm500x                 MACH_ACM500X            ACM500X                 2475
+km9260                  MACH_KM9260             KM9260                  2476
+nideflexg1              MACH_NIDEFLEXG1         NIDEFLEXG1              2477
+ctera_plug_io           MACH_CTERA_PLUG_IO      CTERA_PLUG_IO           2478
+smartq7                 MACH_SMARTQ7            SMARTQ7                 2479
+at91sam9g10ek2          MACH_AT91SAM9G10EK2     AT91SAM9G10EK2          2480
+asusp527                MACH_ASUSP527           ASUSP527                2481
+at91sam9g20mpm2         MACH_AT91SAM9G20MPM2    AT91SAM9G20MPM2         2482
+topasa900               MACH_TOPASA900          TOPASA900               2483
+electrum_100            MACH_ELECTRUM_100       ELECTRUM_100            2484
+mx51grb                 MACH_MX51GRB            MX51GRB                 2485
+xea300                  MACH_XEA300             XEA300                  2486
+htcstartrek             MACH_HTCSTARTREK        HTCSTARTREK             2487
+lima                    MACH_LIMA               LIMA                    2488
+csb740                  MACH_CSB740             CSB740                  2489
+usb_s8815               MACH_USB_S8815          USB_S8815               2490
+watson_efm_plugin       MACH_WATSON_EFM_PLUGIN  WATSON_EFM_PLUGIN       2491
+milkyway                MACH_MILKYWAY           MILKYWAY                2492
+g4evm                   MACH_G4EVM              G4EVM                   2493
+picomod6                MACH_PICOMOD6           PICOMOD6                2494
+omapl138_hawkboard      MACH_OMAPL138_HAWKBOARD OMAPL138_HAWKBOARD      2495
+ip6000                  MACH_IP6000             IP6000                  2496
+ip6010                  MACH_IP6010             IP6010                  2497
+utm400                  MACH_UTM400             UTM400                  2498
+omap3_zybex             MACH_OMAP3_ZYBEX        OMAP3_ZYBEX             2499
+wireless_space          MACH_WIRELESS_SPACE     WIRELESS_SPACE          2500
+sx560                   MACH_SX560              SX560                   2501
+ts41x                   MACH_TS41X              TS41X                   2502
+elphel10373             MACH_ELPHEL10373        ELPHEL10373             2503
+rhobot                  MACH_RHOBOT             RHOBOT                  2504
+mx51_refresh            MACH_MX51_REFRESH       MX51_REFRESH            2505
+ls9260                  MACH_LS9260             LS9260                  2506
+shank                   MACH_SHANK              SHANK                   2507
+qsd8x50_st1             MACH_QSD8X50_ST1        QSD8X50_ST1             2508
+at91sam9m10ekes         MACH_AT91SAM9M10EKES    AT91SAM9M10EKES         2509
+hiram                   MACH_HIRAM              HIRAM                   2510
+phy3250                 MACH_PHY3250            PHY3250                 2511
+ea3250                  MACH_EA3250             EA3250                  2512
+fdi3250                 MACH_FDI3250            FDI3250                 2513
+whitestone              MACH_WHITESTONE         WHITESTONE              2514
+at91sam9263nit          MACH_AT91SAM9263NIT     AT91SAM9263NIT          2515
+ccmx51                  MACH_CCMX51             CCMX51                  2516
+ccmx51js                MACH_CCMX51JS           CCMX51JS                2517
+ccwmx51                 MACH_CCWMX51            CCWMX51                 2518
+ccwmx51js               MACH_CCWMX51JS          CCWMX51JS               2519
+mini6410                MACH_MINI6410           MINI6410                2520
+tiny6410                MACH_TINY6410           TINY6410                2521
+nano6410                MACH_NANO6410           NANO6410                2522
+at572d940hfnldb         MACH_AT572D940HFNLDB    AT572D940HFNLDB         2523
+htcleo                  MACH_HTCLEO             HTCLEO                  2524
+avp13                   MACH_AVP13              AVP13                   2525
+xxsvideod               MACH_XXSVIDEOD          XXSVIDEOD               2526
+vpnext                  MACH_VPNEXT             VPNEXT                  2527
+swarco_itc3             MACH_SWARCO_ITC3        SWARCO_ITC3             2528
+tx51                    MACH_TX51               TX51                    2529
+dolby_cat1021           MACH_DOLBY_CAT1021      DOLBY_CAT1021           2530
+mx28evk                 MACH_MX28EVK            MX28EVK                 2531
+phoenix260              MACH_PHOENIX260         PHOENIX260              2532
+uvaca_stork             MACH_UVACA_STORK        UVACA_STORK             2533
+smartq5                 MACH_SMARTQ5            SMARTQ5                 2534
+all3078                 MACH_ALL3078            ALL3078                 2535
+ctera_2bay_ds           MACH_CTERA_2BAY_DS      CTERA_2BAY_DS           2536
+siogentoo3              MACH_SIOGENTOO3         SIOGENTOO3              2537
+epb5000                 MACH_EPB5000            EPB5000                 2538
+hy9263                  MACH_HY9263             HY9263                  2539
+acer_tempo_m900         MACH_ACER_TEMPO_M900    ACER_TEMPO_M900         2540
+acer_tempo_dx650        MACH_ACER_TEMPO_DX900   ACER_TEMPO_DX900        2541
+acer_tempo_x960         MACH_ACER_TEMPO_X960    ACER_TEMPO_X960         2542
+acer_eten_v900          MACH_ACER_ETEN_V900     ACER_ETEN_V900          2543
+acer_eten_x900          MACH_ACER_ETEN_X900     ACER_ETEN_X900          2544
+bonnell                 MACH_BONNELL            BONNELL                 2545
+oht_mx27                MACH_OHT_MX27           OHT_MX27                2546
+htcquartz               MACH_HTCQUARTZ          HTCQUARTZ               2547
+davinci_dm6467tevm      MACH_DAVINCI_DM6467TEVM DAVINCI_DM6467TEVM      2548
+c3ax03                  MACH_C3AX03             C3AX03                  2549
+mxt_td60                MACH_MXT_TD60           MXT_TD60                2550
+esyx                    MACH_ESYX               ESYX                    2551
+bulldog                 MACH_BULLDOG            BULLDOG                 2553
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 1fca59077949..fbab6846ae64 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -650,7 +650,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
        return 0;
 out_irq:
-        free_irq(alg_data->irq, alg_data);
+        free_irq(alg_data->irq, i2c_pnx->adapter);
 out_clock:
        i2c_pnx->set_clock_stop(pdev);
 out_unmap:
@@ -669,7 +669,7 @@ static int __devexit i2c_pnx_remove(struct platform_device *pdev)
        struct i2c_adapter *adap = i2c_pnx->adapter;
        struct i2c_pnx_algo_data *alg_data = adap->algo_data;
-        free_irq(alg_data->irq, alg_data);
+        free_irq(alg_data->irq, i2c_pnx->adapter);
        i2c_del_adapter(adap);
        i2c_pnx->set_clock_stop(pdev);
        iounmap((void *)alg_data->ioaddr);
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index f24d04132eda..4d227b152001 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -317,7 +317,7 @@ static int __devexit pnx4008_wdt_remove(struct platform_device *pdev)
 static struct platform_driver platform_wdt_driver = {
        .driver = {
-                .name = "watchdog",
+                .name = "pnx4008-watchdog",
                .owner  = THIS_MODULE,
        },
        .probe = pnx4008_wdt_probe,
@@ -352,4 +352,4 @@ MODULE_PARM_DESC(nowayout,
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS("platform:watchdog");
+MODULE_ALIAS("platform:pnx4008-watchdog");
author	Linus Torvalds <torvalds@linux-foundation.org>	2009-11-30 17:50:01 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2009-11-30 17:50:01 -0500
commit	07a6d5a49c985ae6111221b93b3a48772cc4b976 (patch)
tree	ab55ca70c64aa8d9d9c8c003092ae9d95d2bfc57
parent	b4297b01198bc2501038bb463b6631f6f3782cc0 (diff)
parent	3fcca9ac6cbce35b3e81e247d375534117d5f4cd (diff)

diff --git a/MAINTAINERS b/MAINTAINERS index 23d09d78a7b9..c385456caaf0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS
@@ -512,10 +512,32 @@ W: http://www.arm.linux.org.uk/
512	S: Maintained	512	S: Maintained
513	F: arch/arm/	513	F: arch/arm/
514		514
		515	ARM PRIMECELL AACI PL041 DRIVER
		516	M: Russell King <linux@arm.linux.org.uk>
		517	S: Maintained
		518	F: sound/arm/aaci.*
		519
		520	ARM PRIMECELL CLCD PL110 DRIVER
		521	M: Russell King <linux@arm.linux.org.uk>
		522	S: Maintained
		523	F: drivers/video/amba-clcd.*
		524
		525	ARM PRIMECELL KMI PL050 DRIVER
		526	M: Russell King <linux@arm.linux.org.uk>
		527	S: Maintained
		528	F: drivers/input/serio/ambakmi.*
		529	F: include/linux/amba/kmi.h
		530
515	ARM PRIMECELL MMCI PL180/1 DRIVER	531	ARM PRIMECELL MMCI PL180/1 DRIVER
516	S: Orphan	532	S: Orphan
517	F: drivers/mmc/host/mmci.*	533	F: drivers/mmc/host/mmci.*
518		534
		535	ARM PRIMECELL BUS SUPPORT
		536	M: Russell King <linux@arm.linux.org.uk>
		537	S: Maintained
		538	F: drivers/amba/
		539	F: include/linux/amba/bus.h
		540
519	ARM/ADI ROADRUNNER MACHINE SUPPORT	541	ARM/ADI ROADRUNNER MACHINE SUPPORT
520	M: Lennert Buytenhek <kernel@wantstofly.org>	542	M: Lennert Buytenhek <kernel@wantstofly.org>
521	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)	543	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)


diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h index d16ec97ec9a9..c019949a5189 100644 --- a/arch/arm/include/asm/kmap_types.h +++ b/arch/arm/include/asm/kmap_types.h
@@ -22,4 +22,10 @@ enum km_type {
22	KM_TYPE_NR	22	KM_TYPE_NR
23	};	23	};
24		24
		25	#ifdef CONFIG_DEBUG_HIGHMEM
		26	#define KM_NMI (-1)
		27	#define KM_NMI_PTE (-1)
		28	#define KM_IRQ_PTE (-1)
		29	#endif
		30
25	#endif	31	#endif


diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 2a573d4fea24..e7714f367eb8 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c
@@ -662,8 +662,12 @@ static void do_signal(struct pt_regs *regs, int syscall)
662	regs->ARM_sp -= 4;	662	regs->ARM_sp -= 4;
663	usp = (u32 __user *)regs->ARM_sp;	663	usp = (u32 __user *)regs->ARM_sp;
664		664
665	put_user(regs->ARM_pc, usp);	665	if (put_user(regs->ARM_pc, usp) == 0) {
666	regs->ARM_pc = KERN_RESTART_CODE;	666	regs->ARM_pc = KERN_RESTART_CODE;
		667	} else {
		668	regs->ARM_sp += 4;
		669	force_sigsegv(0, current);
		670	}
667	#endif	671	#endif
668	}	672	}
669	}	673	}


diff --git a/arch/arm/mach-pxa/cpufreq-pxa2xx.c b/arch/arm/mach-pxa/cpufreq-pxa2xx.c index 983cc8c20081..9e4d9816726a 100644 --- a/arch/arm/mach-pxa/cpufreq-pxa2xx.c +++ b/arch/arm/mach-pxa/cpufreq-pxa2xx.c
@@ -447,6 +447,7 @@ static __init int pxa_cpufreq_init(struct cpufreq_policy *policy)
447	pxa27x_freq_table[i].frequency = freq;	447	pxa27x_freq_table[i].frequency = freq;
448	pxa27x_freq_table[i].index = i;	448	pxa27x_freq_table[i].index = i;
449	}	449	}
		450	pxa27x_freq_table[i].index = i;
450	pxa27x_freq_table[i].frequency = CPUFREQ_TABLE_END;	451	pxa27x_freq_table[i].frequency = CPUFREQ_TABLE_END;
451		452
452	/*	453	/*


diff --git a/arch/arm/mach-pxa/cpufreq-pxa3xx.c b/arch/arm/mach-pxa/cpufreq-pxa3xx.c index 67f34a8d8e60..149cdd9aee4d 100644 --- a/arch/arm/mach-pxa/cpufreq-pxa3xx.c +++ b/arch/arm/mach-pxa/cpufreq-pxa3xx.c
@@ -102,7 +102,7 @@ static int setup_freqs_table(struct cpufreq_policy *policy,
102	table[i].index = i;	102	table[i].index = i;
103	table[i].frequency = freqs[i].cpufreq_mhz * 1000;	103	table[i].frequency = freqs[i].cpufreq_mhz * 1000;
104	}	104	}
105	table[num].frequency = i;	105	table[num].index = i;
106	table[num].frequency = CPUFREQ_TABLE_END;	106	table[num].frequency = CPUFREQ_TABLE_END;
107		107
108	pxa3xx_freqs = freqs;	108	pxa3xx_freqs = freqs;


diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 3da45d051743..d98023f55503 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c
@@ -802,10 +802,12 @@ static void __init spitz_init(void)
802	{	802	{
803	spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON;	803	spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON;
804		804
		805	#ifdef CONFIG_MACH_BORZOI
805	if (machine_is_borzoi()) {	806	if (machine_is_borzoi()) {
806	sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;	807	sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
807	sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;	808	sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
808	}	809	}
		810	#endif
809		811
810	platform_scoop_config = &spitz_pcmcia_config;	812	platform_scoop_config = &spitz_pcmcia_config;
811		813


diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index 94be7bb6cb9a..07b976da6174 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
12	#	12	#
13	# http://www.arm.linux.org.uk/developer/machines/?action=new	13	# http://www.arm.linux.org.uk/developer/machines/?action=new
14	#	14	#
15	# Last update: Fri Sep 18 21:42:00 2009	15	# Last update: Wed Nov 25 22:14:58 2009
16	#	16	#
17	# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number	17	# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
18	#	18	#
@@ -928,7 +928,7 @@ palmt5 MACH_PALMT5 PALMT5 917
928	palmtc MACH_PALMTC PALMTC 918	928	palmtc MACH_PALMTC PALMTC 918
929	omap_apollon MACH_OMAP_APOLLON OMAP_APOLLON 919	929	omap_apollon MACH_OMAP_APOLLON OMAP_APOLLON 919
930	mxc30030evb MACH_MXC30030EVB MXC30030EVB 920	930	mxc30030evb MACH_MXC30030EVB MXC30030EVB 920
931	rea_2d MACH_REA_2D REA_2D 921	931	rea_cpu2 MACH_REA_2D REA_2D 921
932	eti3e524 MACH_TI3E524 TI3E524 922	932	eti3e524 MACH_TI3E524 TI3E524 922
933	ateb9200 MACH_ATEB9200 ATEB9200 923	933	ateb9200 MACH_ATEB9200 ATEB9200 923
934	auckland MACH_AUCKLAND AUCKLAND 924	934	auckland MACH_AUCKLAND AUCKLAND 924
@@ -2421,3 +2421,118 @@ liberty MACH_LIBERTY LIBERTY 2434
2421	mh355 MACH_MH355 MH355 2435	2421	mh355 MACH_MH355 MH355 2435
2422	pc7802 MACH_PC7802 PC7802 2436	2422	pc7802 MACH_PC7802 PC7802 2436
2423	gnet_sgc MACH_GNET_SGC GNET_SGC 2437	2423	gnet_sgc MACH_GNET_SGC GNET_SGC 2437
		2424	einstein15 MACH_EINSTEIN15 EINSTEIN15 2438
		2425	cmpd MACH_CMPD CMPD 2439
		2426	davinci_hase1 MACH_DAVINCI_HASE1 DAVINCI_HASE1 2440
		2427	lgeincitephone MACH_LGEINCITEPHONE LGEINCITEPHONE 2441
		2428	ea313x MACH_EA313X EA313X 2442
		2429	fwbd_39064 MACH_FWBD_39064 FWBD_39064 2443
		2430	fwbd_390128 MACH_FWBD_390128 FWBD_390128 2444
		2431	pelco_moe MACH_PELCO_MOE PELCO_MOE 2445
		2432	minimix27 MACH_MINIMIX27 MINIMIX27 2446
		2433	omap3_thunder MACH_OMAP3_THUNDER OMAP3_THUNDER 2447
		2434	passionc MACH_PASSIONC PASSIONC 2448
		2435	mx27amata MACH_MX27AMATA MX27AMATA 2449
		2436	bgat1 MACH_BGAT1 BGAT1 2450
		2437	buzz MACH_BUZZ BUZZ 2451
		2438	mb9g20 MACH_MB9G20 MB9G20 2452
		2439	yushan MACH_YUSHAN YUSHAN 2453
		2440	lizard MACH_LIZARD LIZARD 2454
		2441	omap3polycom MACH_OMAP3POLYCOM OMAP3POLYCOM 2455
		2442	smdkv210 MACH_SMDKV210 SMDKV210 2456
		2443	bravo MACH_BRAVO BRAVO 2457
		2444	siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1 2458
		2445	siogentoo2 MACH_SIOGENTOO2 SIOGENTOO2 2459
		2446	sm3k MACH_SM3K SM3K 2460
		2447	acer_tempo_f900 MACH_ACER_TEMPO_F900 ACER_TEMPO_F900 2461
		2448	sst61vc010_dev MACH_SST61VC010_DEV SST61VC010_DEV 2462
		2449	glittertind MACH_GLITTERTIND GLITTERTIND 2463
		2450	omap_zoom3 MACH_OMAP_ZOOM3 OMAP_ZOOM3 2464
		2451	omap_3630sdp MACH_OMAP_3630SDP OMAP_3630SDP 2465
		2452	cybook2440 MACH_CYBOOK2440 CYBOOK2440 2466
		2453	torino_s MACH_TORINO_S TORINO_S 2467
		2454	havana MACH_HAVANA HAVANA 2468
		2455	beaumont_11 MACH_BEAUMONT_11 BEAUMONT_11 2469
		2456	vanguard MACH_VANGUARD VANGUARD 2470
		2457	s5pc110_draco MACH_S5PC110_DRACO S5PC110_DRACO 2471
		2458	cartesio_two MACH_CARTESIO_TWO CARTESIO_TWO 2472
		2459	aster MACH_ASTER ASTER 2473
		2460	voguesv210 MACH_VOGUESV210 VOGUESV210 2474
		2461	acm500x MACH_ACM500X ACM500X 2475
		2462	km9260 MACH_KM9260 KM9260 2476
		2463	nideflexg1 MACH_NIDEFLEXG1 NIDEFLEXG1 2477
		2464	ctera_plug_io MACH_CTERA_PLUG_IO CTERA_PLUG_IO 2478
		2465	smartq7 MACH_SMARTQ7 SMARTQ7 2479
		2466	at91sam9g10ek2 MACH_AT91SAM9G10EK2 AT91SAM9G10EK2 2480
		2467	asusp527 MACH_ASUSP527 ASUSP527 2481
		2468	at91sam9g20mpm2 MACH_AT91SAM9G20MPM2 AT91SAM9G20MPM2 2482
		2469	topasa900 MACH_TOPASA900 TOPASA900 2483
		2470	electrum_100 MACH_ELECTRUM_100 ELECTRUM_100 2484
		2471	mx51grb MACH_MX51GRB MX51GRB 2485
		2472	xea300 MACH_XEA300 XEA300 2486
		2473	htcstartrek MACH_HTCSTARTREK HTCSTARTREK 2487
		2474	lima MACH_LIMA LIMA 2488
		2475	csb740 MACH_CSB740 CSB740 2489
		2476	usb_s8815 MACH_USB_S8815 USB_S8815 2490
		2477	watson_efm_plugin MACH_WATSON_EFM_PLUGIN WATSON_EFM_PLUGIN 2491
		2478	milkyway MACH_MILKYWAY MILKYWAY 2492
		2479	g4evm MACH_G4EVM G4EVM 2493
		2480	picomod6 MACH_PICOMOD6 PICOMOD6 2494
		2481	omapl138_hawkboard MACH_OMAPL138_HAWKBOARD OMAPL138_HAWKBOARD 2495
		2482	ip6000 MACH_IP6000 IP6000 2496
		2483	ip6010 MACH_IP6010 IP6010 2497
		2484	utm400 MACH_UTM400 UTM400 2498
		2485	omap3_zybex MACH_OMAP3_ZYBEX OMAP3_ZYBEX 2499
		2486	wireless_space MACH_WIRELESS_SPACE WIRELESS_SPACE 2500
		2487	sx560 MACH_SX560 SX560 2501
		2488	ts41x MACH_TS41X TS41X 2502
		2489	elphel10373 MACH_ELPHEL10373 ELPHEL10373 2503
		2490	rhobot MACH_RHOBOT RHOBOT 2504
		2491	mx51_refresh MACH_MX51_REFRESH MX51_REFRESH 2505
		2492	ls9260 MACH_LS9260 LS9260 2506
		2493	shank MACH_SHANK SHANK 2507
		2494	qsd8x50_st1 MACH_QSD8X50_ST1 QSD8X50_ST1 2508
		2495	at91sam9m10ekes MACH_AT91SAM9M10EKES AT91SAM9M10EKES 2509
		2496	hiram MACH_HIRAM HIRAM 2510
		2497	phy3250 MACH_PHY3250 PHY3250 2511
		2498	ea3250 MACH_EA3250 EA3250 2512
		2499	fdi3250 MACH_FDI3250 FDI3250 2513
		2500	whitestone MACH_WHITESTONE WHITESTONE 2514
		2501	at91sam9263nit MACH_AT91SAM9263NIT AT91SAM9263NIT 2515
		2502	ccmx51 MACH_CCMX51 CCMX51 2516
		2503	ccmx51js MACH_CCMX51JS CCMX51JS 2517
		2504	ccwmx51 MACH_CCWMX51 CCWMX51 2518
		2505	ccwmx51js MACH_CCWMX51JS CCWMX51JS 2519
		2506	mini6410 MACH_MINI6410 MINI6410 2520
		2507	tiny6410 MACH_TINY6410 TINY6410 2521
		2508	nano6410 MACH_NANO6410 NANO6410 2522
		2509	at572d940hfnldb MACH_AT572D940HFNLDB AT572D940HFNLDB 2523
		2510	htcleo MACH_HTCLEO HTCLEO 2524
		2511	avp13 MACH_AVP13 AVP13 2525
		2512	xxsvideod MACH_XXSVIDEOD XXSVIDEOD 2526
		2513	vpnext MACH_VPNEXT VPNEXT 2527
		2514	swarco_itc3 MACH_SWARCO_ITC3 SWARCO_ITC3 2528
		2515	tx51 MACH_TX51 TX51 2529
		2516	dolby_cat1021 MACH_DOLBY_CAT1021 DOLBY_CAT1021 2530
		2517	mx28evk MACH_MX28EVK MX28EVK 2531
		2518	phoenix260 MACH_PHOENIX260 PHOENIX260 2532
		2519	uvaca_stork MACH_UVACA_STORK UVACA_STORK 2533
		2520	smartq5 MACH_SMARTQ5 SMARTQ5 2534
		2521	all3078 MACH_ALL3078 ALL3078 2535
		2522	ctera_2bay_ds MACH_CTERA_2BAY_DS CTERA_2BAY_DS 2536
		2523	siogentoo3 MACH_SIOGENTOO3 SIOGENTOO3 2537
		2524	epb5000 MACH_EPB5000 EPB5000 2538
		2525	hy9263 MACH_HY9263 HY9263 2539
		2526	acer_tempo_m900 MACH_ACER_TEMPO_M900 ACER_TEMPO_M900 2540
		2527	acer_tempo_dx650 MACH_ACER_TEMPO_DX900 ACER_TEMPO_DX900 2541
		2528	acer_tempo_x960 MACH_ACER_TEMPO_X960 ACER_TEMPO_X960 2542
		2529	acer_eten_v900 MACH_ACER_ETEN_V900 ACER_ETEN_V900 2543
		2530	acer_eten_x900 MACH_ACER_ETEN_X900 ACER_ETEN_X900 2544
		2531	bonnell MACH_BONNELL BONNELL 2545
		2532	oht_mx27 MACH_OHT_MX27 OHT_MX27 2546
		2533	htcquartz MACH_HTCQUARTZ HTCQUARTZ 2547
		2534	davinci_dm6467tevm MACH_DAVINCI_DM6467TEVM DAVINCI_DM6467TEVM 2548
		2535	c3ax03 MACH_C3AX03 C3AX03 2549
		2536	mxt_td60 MACH_MXT_TD60 MXT_TD60 2550
		2537	esyx MACH_ESYX ESYX 2551
		2538	bulldog MACH_BULLDOG BULLDOG 2553


diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c index 1fca59077949..fbab6846ae64 100644 --- a/drivers/i2c/busses/i2c-pnx.c +++ b/drivers/i2c/busses/i2c-pnx.c
@@ -650,7 +650,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
650	return 0;	650	return 0;
651		651
652	out_irq:	652	out_irq:
653	free_irq(alg_data->irq, alg_data);	653	free_irq(alg_data->irq, i2c_pnx->adapter);
654	out_clock:	654	out_clock:
655	i2c_pnx->set_clock_stop(pdev);	655	i2c_pnx->set_clock_stop(pdev);
656	out_unmap:	656	out_unmap:
@@ -669,7 +669,7 @@ static int __devexit i2c_pnx_remove(struct platform_device *pdev)
669	struct i2c_adapter *adap = i2c_pnx->adapter;	669	struct i2c_adapter *adap = i2c_pnx->adapter;
670	struct i2c_pnx_algo_data *alg_data = adap->algo_data;	670	struct i2c_pnx_algo_data *alg_data = adap->algo_data;
671		671
672	free_irq(alg_data->irq, alg_data);	672	free_irq(alg_data->irq, i2c_pnx->adapter);
673	i2c_del_adapter(adap);	673	i2c_del_adapter(adap);
674	i2c_pnx->set_clock_stop(pdev);	674	i2c_pnx->set_clock_stop(pdev);
675	iounmap((void *)alg_data->ioaddr);	675	iounmap((void *)alg_data->ioaddr);


diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index f24d04132eda..4d227b152001 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c
@@ -317,7 +317,7 @@ static int __devexit pnx4008_wdt_remove(struct platform_device *pdev)
317		317
318	static struct platform_driver platform_wdt_driver = {	318	static struct platform_driver platform_wdt_driver = {
319	.driver = {	319	.driver = {
320	.name = "watchdog",	320	.name = "pnx4008-watchdog",
321	.owner = THIS_MODULE,	321	.owner = THIS_MODULE,
322	},	322	},
323	.probe = pnx4008_wdt_probe,	323	.probe = pnx4008_wdt_probe,
@@ -352,4 +352,4 @@ MODULE_PARM_DESC(nowayout,
352		352
353	MODULE_LICENSE("GPL");	353	MODULE_LICENSE("GPL");
354	MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);	354	MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
355	MODULE_ALIAS("platform:watchdog");	355	MODULE_ALIAS("platform:pnx4008-watchdog");