aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-15 12:51:09 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-15 12:51:09 -0400
commit723e9db7a46e328527cc3da2b478b831184fe828 (patch)
treecdeda255633057dcb4c84097bed27b2bbf76970f /drivers/macintosh
parentada3fa15057205b7d3f727bba5cd26b5912e350f (diff)
parentd331d8305cba713605854aab63a000fb892353a7 (diff)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits) powerpc/nvram: Enable use Generic NVRAM driver for different size chips powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline powerpc/ps3: Workaround for flash memory I/O error powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead powerpc/perf_counters: Reduce stack usage of power_check_constraints powerpc: Fix bug where perf_counters breaks oprofile powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops powerpc/irq: Improve nanodoc powerpc: Fix some late PowerMac G5 with PCIe ATI graphics powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT powerpc/book3e: Add missing page sizes powerpc/pseries: Fix to handle slb resize across migration powerpc/powermac: Thermal control turns system off too eagerly powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan() powerpc/405ex: support cuImage via included dtb powerpc/405ex: provide necessary fixup function to support cuImage powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support. powerpc/44x: Update Arches defconfig powerpc/44x: Update Arches dts ... Fix up conflicts in drivers/char/agp/uninorth-agp.c
Diffstat (limited to 'drivers/macintosh')
-rw-r--r--drivers/macintosh/macio_asic.c6
-rw-r--r--drivers/macintosh/therm_windtunnel.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index a0f68386c12f..588a5b0bc4b5 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -294,10 +294,11 @@ static void macio_setup_interrupts(struct macio_dev *dev)
294 int i = 0, j = 0; 294 int i = 0, j = 0;
295 295
296 for (;;) { 296 for (;;) {
297 struct resource *res = &dev->interrupt[j]; 297 struct resource *res;
298 298
299 if (j >= MACIO_DEV_COUNT_IRQS) 299 if (j >= MACIO_DEV_COUNT_IRQS)
300 break; 300 break;
301 res = &dev->interrupt[j];
301 irq = irq_of_parse_and_map(np, i++); 302 irq = irq_of_parse_and_map(np, i++);
302 if (irq == NO_IRQ) 303 if (irq == NO_IRQ)
303 break; 304 break;
@@ -321,9 +322,10 @@ static void macio_setup_resources(struct macio_dev *dev,
321 int index; 322 int index;
322 323
323 for (index = 0; of_address_to_resource(np, index, &r) == 0; index++) { 324 for (index = 0; of_address_to_resource(np, index, &r) == 0; index++) {
324 struct resource *res = &dev->resource[index]; 325 struct resource *res;
325 if (index >= MACIO_DEV_COUNT_RESOURCES) 326 if (index >= MACIO_DEV_COUNT_RESOURCES)
326 break; 327 break;
328 res = &dev->resource[index];
327 *res = r; 329 *res = r;
328 res->name = dev_name(&dev->ofdev.dev); 330 res->name = dev_name(&dev->ofdev.dev);
329 331
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 40023313a760..8b9364434aa0 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -239,8 +239,8 @@ setup_hardware( void )
239 * to be on the safe side (OSX doesn't)... 239 * to be on the safe side (OSX doesn't)...
240 */ 240 */
241 if( x.overheat_temp == (80 << 8) ) { 241 if( x.overheat_temp == (80 << 8) ) {
242 x.overheat_temp = 65 << 8; 242 x.overheat_temp = 75 << 8;
243 x.overheat_hyst = 60 << 8; 243 x.overheat_hyst = 70 << 8;
244 write_reg( x.thermostat, 2, x.overheat_hyst, 2 ); 244 write_reg( x.thermostat, 2, x.overheat_hyst, 2 );
245 write_reg( x.thermostat, 3, x.overheat_temp, 2 ); 245 write_reg( x.thermostat, 3, x.overheat_temp, 2 );
246 246