Merge branch 'korg-android-3.1' into korg-android+linux-tegra-3.1
Dan Willemsen [Thu, 1 Dec 2011 05:41:00 +0000 (21:41 -0800)]
Conflicts:
arch/arm/mm/cache-l2x0.c
drivers/misc/Kconfig
drivers/misc/Makefile

Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

17 files changed:
1  2 
arch/arm/Kconfig
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/mm/cache-l2x0.c
arch/arm/vfp/vfpmodule.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/host/sdhci.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/usb/gadget/Kconfig
drivers/usb/gadget/Makefile
drivers/usb/host/ehci-q.c
drivers/usb/otg/Kconfig
drivers/usb/otg/Makefile
drivers/video/Kconfig

Simple merge
  #define L2X0_AUX_CTRL_INSTR_PREFETCH_SHIFT    29
  #define L2X0_AUX_CTRL_EARLY_BRESP_SHIFT               30
  
+ #define REV_PL310_R2P0                                4
  #ifndef __ASSEMBLY__
 -extern void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask);
 +extern void l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask);
 +extern void l2x0_enable(void);
  #endif
  
  #endif
@@@ -306,12 -339,10 +349,10 @@@ static void __init l2x0_unlock(__u32 ca
        }
  }
  
 -void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask)
 +void l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask)
  {
        __u32 aux;
-       __u32 cache_id;
        __u32 way_size = 0;
-       int ways;
        const char *type;
  
        l2x0_base = base;
        outer_cache.disable = l2x0_disable;
        outer_cache.set_debug = l2x0_set_debug;
  
 -      printk(KERN_INFO "%s cache controller enabled\n", type);
 -      printk(KERN_INFO "l2x0: %d ways, CACHE_ID 0x%08x, AUX_CTRL 0x%08x, Cache size: %d B\n",
 +      pr_info_once("%s cache controller enabled\n", type);
 +      pr_info_once("l2x0: %d ways, CACHE_ID 0x%08x, AUX_CTRL 0x%08x, Cache size: %d B\n",
-                       ways, cache_id, aux, l2x0_size);
+                       l2x0_ways, l2x0_cache_id, aux, l2x0_size);
  }
Simple merge
Simple merge
Simple merge
@@@ -392,14 -396,14 +396,22 @@@ config HMC635
          This driver provides support for the Honeywell HMC6352 compass,
          providing configuration and heading data via sysfs.
  
+ config SENSORS_AK8975
+       tristate "AK8975 compass support"
+       default n
+       depends on I2C
+       help
+         If you say yes here you get support for Asahi Kasei's
+         orientation sensor AK8975.
 +config SENSORS_NCT1008
 +      tristate "ON Semiconductor Temperature Sensor"
 +      default n
 +      depends on I2C
 +      help
 +       Say yes here if you wish to include the ON Semiconductor
 +       NCT1008 Temperature sensor.
 +
  config EP93XX_PWM
        tristate "EP93xx PWM support"
        depends on ARCH_EP93XX
@@@ -47,4 -49,6 +49,7 @@@ obj-$(CONFIG_AB8500_PWM)      += ab8500-pwm.
  obj-y                         += lis3lv02d/
  obj-y                         += carma/
  obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
+ obj-$(CONFIG_WL127X_RFKILL)   += wl127x-rfkill.o
+ obj-$(CONFIG_APANIC)          += apanic.o
+ obj-$(CONFIG_SENSORS_AK8975)  += akm8975.o
 +obj-$(CONFIG_SENSORS_NCT1008) += nct1008.o
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge