From: 黄涛 Date: Thu, 12 Jul 2012 10:08:01 +0000 (+0800) Subject: Merge remote-tracking branch 'common/android-3.0' into develop-3.0-jb X-Git-Tag: firefly_0821_release~8882^2~20 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=30be6d79726beb30f7e3898aff40eb365eaabf32;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'common/android-3.0' into develop-3.0-jb Conflicts: drivers/cpufreq/cpufreq_interactive.c drivers/misc/pmem.c drivers/net/usb/asix.c drivers/net/wireless/ath/ath9k/ani.c drivers/net/wireless/ath/ath9k/ar5008_phy.c drivers/net/wireless/ath/ath9k/ar9002_hw.c drivers/net/wireless/ath/ath9k/ar9003_calib.c drivers/net/wireless/ath/ath9k/ar9003_mac.c drivers/net/wireless/ath/ath9k/ar9003_phy.h drivers/net/wireless/ath/ath9k/calib.c drivers/net/wireless/ath/ath9k/hif_usb.c drivers/net/wireless/ath/ath9k/hw.c drivers/net/wireless/ath/ath9k/hw.h drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/ath/ath9k/rc.c drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/b43/main.c drivers/net/wireless/bcm4319/aiutils.c drivers/net/wireless/bcm4319/bcmsdh.c drivers/net/wireless/bcm4319/bcmsdh_linux.c drivers/net/wireless/bcm4319/bcmsdh_sdmmc.c drivers/net/wireless/bcm4319/bcmsdh_sdmmc_linux.c drivers/net/wireless/bcm4319/bcmutils.c drivers/net/wireless/bcm4319/dhd_common.c drivers/net/wireless/bcm4319/dhd_proto.h drivers/net/wireless/bcm4319/dhd_sdio.c drivers/net/wireless/bcm4319/hndpmu.c drivers/net/wireless/bcm4319/include/aidmp.h drivers/net/wireless/bcm4319/include/bcmcdc.h drivers/net/wireless/bcm4319/include/bcmdefs.h drivers/net/wireless/bcm4319/include/bcmdevs.h drivers/net/wireless/bcm4319/include/bcmendian.h drivers/net/wireless/bcm4319/include/bcmpcispi.h drivers/net/wireless/bcm4319/include/bcmperf.h drivers/net/wireless/bcm4319/include/bcmsdbus.h drivers/net/wireless/bcm4319/include/bcmsdh.h drivers/net/wireless/bcm4319/include/bcmsdh_sdmmc.h drivers/net/wireless/bcm4319/include/bcmsdpcm.h drivers/net/wireless/bcm4319/include/bcmsdspi.h drivers/net/wireless/bcm4319/include/bcmsdstd.h drivers/net/wireless/bcm4319/include/bcmspi.h drivers/net/wireless/bcm4319/include/bcmutils.h drivers/net/wireless/bcm4319/include/bcmwifi.h drivers/net/wireless/bcm4319/include/dhdioctl.h drivers/net/wireless/bcm4319/include/epivers.h drivers/net/wireless/bcm4319/include/hndpmu.h drivers/net/wireless/bcm4319/include/hndrte_armtrap.h drivers/net/wireless/bcm4319/include/hndrte_cons.h drivers/net/wireless/bcm4319/include/hndsoc.h drivers/net/wireless/bcm4319/include/linux_osl.h drivers/net/wireless/bcm4319/include/linuxver.h drivers/net/wireless/bcm4319/include/miniopt.h drivers/net/wireless/bcm4319/include/msgtrace.h drivers/net/wireless/bcm4319/include/osl.h drivers/net/wireless/bcm4319/include/packed_section_end.h drivers/net/wireless/bcm4319/include/packed_section_start.h drivers/net/wireless/bcm4319/include/pcicfg.h drivers/net/wireless/bcm4319/include/proto/802.11e.h drivers/net/wireless/bcm4319/include/proto/802.1d.h drivers/net/wireless/bcm4319/include/proto/bcmeth.h drivers/net/wireless/bcm4319/include/proto/bcmevent.h drivers/net/wireless/bcm4319/include/proto/bcmip.h drivers/net/wireless/bcm4319/include/proto/eapol.h drivers/net/wireless/bcm4319/include/proto/ethernet.h drivers/net/wireless/bcm4319/include/proto/sdspi.h drivers/net/wireless/bcm4319/include/proto/vlan.h drivers/net/wireless/bcm4319/include/proto/wpa.h drivers/net/wireless/bcm4319/include/sbchipc.h drivers/net/wireless/bcm4319/include/sbconfig.h drivers/net/wireless/bcm4319/include/sbhnddma.h drivers/net/wireless/bcm4319/include/sbpcmcia.h drivers/net/wireless/bcm4319/include/sbsdio.h drivers/net/wireless/bcm4319/include/sbsdpcmdev.h drivers/net/wireless/bcm4319/include/sbsocram.h drivers/net/wireless/bcm4319/include/sdio.h drivers/net/wireless/bcm4319/include/sdioh.h drivers/net/wireless/bcm4319/include/sdiovar.h drivers/net/wireless/bcm4319/include/siutils.h drivers/net/wireless/bcm4319/include/trxhdr.h drivers/net/wireless/bcm4319/include/typedefs.h drivers/net/wireless/bcm4319/siutils.c drivers/net/wireless/bcm4319/wl_iw.c drivers/net/wireless/bcm4319/wl_iw.h drivers/net/wireless/bcmdhd/Kconfig drivers/net/wireless/bcmdhd/Makefile drivers/net/wireless/bcmdhd/bcmevent.c drivers/net/wireless/bcmdhd/dhd.h drivers/net/wireless/bcmdhd/dhd_cdc.c drivers/net/wireless/bcmdhd/dhd_linux.c drivers/net/wireless/bcmdhd/dhd_wlfc.h drivers/net/wireless/bcmdhd/include/Makefile drivers/net/wireless/bcmdhd/include/htsf.h drivers/net/wireless/bcmdhd/include/proto/802.11.h drivers/net/wireless/bcmdhd/include/proto/802.11_bta.h drivers/net/wireless/bcmdhd/include/proto/bt_amp_hci.h drivers/net/wireless/bcmdhd/include/proto/p2p.h drivers/net/wireless/bcmdhd/include/wlfc_proto.h drivers/net/wireless/bcmdhd/include/wlioctl.h drivers/net/wireless/bcmdhd/linux_osl.c drivers/net/wireless/bcmdhd/wl_android.c drivers/net/wireless/bcmdhd/wl_android.h drivers/net/wireless/bcmdhd/wl_cfg80211.c drivers/net/wireless/bcmdhd/wl_cfg80211.h drivers/net/wireless/bcmdhd/wl_cfgp2p.c drivers/net/wireless/bcmdhd/wl_cfgp2p.h drivers/net/wireless/bcmdhd/wl_linux_mon.c drivers/net/wireless/bcmdhd/wldev_common.c drivers/net/wireless/bcmdhd/wldev_common.h drivers/net/wireless/ipw2x00/ipw2200.c drivers/net/wireless/iwlwifi/iwl-agn-lib.c drivers/net/wireless/iwlwifi/iwl-agn-tx.c drivers/net/wireless/iwlwifi/iwl-agn-ucode.c drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl-agn.h drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-hcmd.c drivers/net/wireless/iwlwifi/iwl-rx.c drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/libertas/if_spi.c drivers/net/wireless/p54/p54spi.c drivers/net/wireless/rt2x00/rt2800lib.c drivers/net/wireless/rt2x00/rt2800pci.c drivers/net/wireless/rt2x00/rt2800usb.c drivers/net/wireless/rt2x00/rt2x00.h drivers/net/wireless/rt2x00/rt2x00dev.c drivers/net/wireless/rt2x00/rt2x00mac.c drivers/net/wireless/rt2x00/rt2x00queue.c drivers/usb/serial/option.c --- 30be6d79726beb30f7e3898aff40eb365eaabf32 diff --cc Documentation/cpu-freq/governors.txt index 46abbcb28b7c,963a543bde4d..da3cfb34825d --- a/Documentation/cpu-freq/governors.txt +++ b/Documentation/cpu-freq/governors.txt @@@ -225,39 -225,33 +225,60 @@@ frequency before ramping down. This is seen enough historic cpu load data to determine the appropriate workload. Default is 80000 uS. - go_maxspeed_load: The CPU load at which to ramp to max speed. Default - is 85. + hispeed_freq: An intermediate "hi speed" at which to initially ramp + when CPU load hits the value specified in go_hispeed_load. If load + stays high for the amount of time specified in above_hispeed_delay, + then speed may be bumped higher. Default is maximum speed. + + go_hispeed_load: The CPU load at which to ramp to the intermediate "hi + speed". Default is 85%. + + above_hispeed_delay: Once speed is set to hispeed_freq, wait for this + long before bumping speed higher in response to continued high load. + Default is 20000 uS. timer_rate: Sample rate for reevaluating cpu load when the system is - not idle. Default is 30000 uS. + not idle. Default is 20000 uS. + + input_boost: If non-zero, boost speed of all CPUs to hispeed_freq on + touchscreen activity. Default is 0. + + boost: If non-zero, immediately boost speed of all CPUs to at least + hispeed_freq until zero is written to this attribute. If zero, allow + CPU speeds to drop below hispeed_freq according to load as usual. + + boostpulse: Immediately boost speed of all CPUs to hispeed_freq for + min_sample_time, after which speeds are allowed to drop below + hispeed_freq according to load as usual. + +2.7 Hotplug +----------- + +The CPUfreq governor "hotplug" operates similary to "ondemand" and +"conservative". It's decisions are based primarily on CPU load. Like +"ondemand" the "hotplug" governor will ramp up to the highest frequency +once the run-time tunable "up_threshold" parameter is crossed. Like +"conservative", the "hotplug" governor exports a "down_threshold" +parameter that is also tunable at run-time. When the "down_threshold" +is crossed the CPU transitions to the next lowest frequency in the +CPUfreq frequency table instead of decrementing the frequency based on a +percentage of maximum load. + +The main reason "hotplug" governor exists is for architectures requiring +that only the master CPU be online in order to hit low-power states +(C-states). OMAP4 is one such example of this. The "hotplug" governor +is also helpful in reducing thermal output in devices with tight thermal +constraints. + +Auxillary CPUs are onlined/offline based on CPU load, but the decision +to do so is made after averaging several sampling windows. This is to +reduce CPU hotplug "thrashing", which can be caused by normal system +entropy and leads to lots of spurious plug-in and plug-out transitions. +The number of sampling periods averaged together is tunable via the +"hotplug_in_sampling_periods" and "hotplug_out_sampling_periods" +run-time tunable parameters. + 3. The Governor Interface in the CPUfreq Core ============================================= diff --cc block/blk-core.c index 249d1a06e3ad,35ae52df6b6d..44f67b52c399 mode 100755,100644..100755 --- a/block/blk-core.c +++ b/block/blk-core.c diff --cc drivers/bluetooth/hci_ldisc.c index 452132a5ebde,8f3d6dbeb122..2c548724154c mode 100755,100644..100755 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c diff --cc drivers/cpufreq/cpufreq_interactive.c index fd8b2793f54a,7dbacf035e7a..c8bc6488afc2 mode 100755,100644..100755 --- a/drivers/cpufreq/cpufreq_interactive.c +++ b/drivers/cpufreq/cpufreq_interactive.c @@@ -167,15 -196,33 +196,37 @@@ static void cpufreq_interactive_timer(u if (load_since_change > cpu_load) cpu_load = load_since_change; - if (cpu_load >= go_hispeed_load) { - if (pcpu->policy->cur == pcpu->policy->min) ++#ifdef CONFIG_PLAT_RK ++ pcpu->target_freq = pcpu->policy->cur; ++#endif ++ + if (cpu_load >= go_hispeed_load || boost_val) { + if (pcpu->target_freq <= pcpu->policy->min) { new_freq = hispeed_freq; - else + } else { new_freq = pcpu->policy->max * cpu_load / 100; + + if (new_freq < hispeed_freq) + new_freq = hispeed_freq; + + if (pcpu->target_freq == hispeed_freq && + new_freq > hispeed_freq && + cputime64_sub(pcpu->timer_run_time, + pcpu->hispeed_validate_time) + < above_hispeed_delay_val) { + trace_cpufreq_interactive_notyet(data, cpu_load, + pcpu->target_freq, + new_freq); + goto rearm; + } + } } else { - new_freq = pcpu->policy->cur * cpu_load / 100; + new_freq = pcpu->policy->max * cpu_load / 100; } + if (new_freq <= hispeed_freq) + pcpu->hispeed_validate_time = pcpu->timer_run_time; + if (cpufreq_frequency_table_target(pcpu->policy, pcpu->freq_table, new_freq, CPUFREQ_RELATION_H, &index)) { diff --cc drivers/i2c/algos/i2c-algo-bit.c index a0e039db581c,f2ce8c36816f..0f25f3541f33 mode 100755,100644..100755 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c diff --cc drivers/media/video/uvc/uvc_video.c index 97e1c66a5039,6f147defcce7..fb32eb11ee53 mode 100755,100644..100755 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/video/uvc/uvc_video.c diff --cc drivers/media/video/uvc/uvcvideo.h index 06e24361b266,cf2401a041ae..4dc3c2de8eb5 mode 100755,100644..100755 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/video/uvc/uvcvideo.h diff --cc drivers/mmc/card/block.c index f7f7a3c9f3cd,435f1fddfe6b..7f9935ad89a2 mode 100755,100644..100755 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c diff --cc drivers/mmc/core/core.c index 21332db0e5d4,85360955816d..f18ba0aecca7 mode 100755,100644..100755 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c diff --cc drivers/mmc/core/mmc.c index f0216b8743e0,f6011802745c..4847c7392045 mode 100755,100644..100755 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c diff --cc drivers/mmc/core/sd.c index dd1bfdd97782,0635da51a970..2ee448439041 mode 100755,100644..100755 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c diff --cc drivers/mmc/core/sdio.c index 6c67160189e4,a2c1c4d83718..ee715e73b3f7 mode 100755,100644..100755 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c diff --cc drivers/mtd/mtd_blkdevs.c index 783db0e48819,bff8d4671ad6..444d0bd8f23d mode 100755,100644..100755 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c diff --cc drivers/spi/spi.c index 2b39a90fc15d,b423fe92a785..a93551bc5b7c mode 100755,100644..100755 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c diff --cc drivers/usb/core/hcd.c index 103b92a58057,45e090850c93..cc8b9c57150a mode 100755,100644..100755 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c diff --cc drivers/usb/core/hub.c index 447284884115,34bb059607f5..a33954b424ef mode 100755,100644..100755 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c diff --cc drivers/usb/gadget/Kconfig index 30ce90921f4b,aca160e0d943..e222aceb3251 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@@ -544,21 -543,8 +544,21 @@@ config USB_LANGWEL default USB_GADGET select USB_GADGET_SELECTED +config USB_GADGET_DWC_OTG + boolean "Synopsys DWC OTG Controller" + select USB_GADGET_DUALSPEED + help + This driver provides USB Device Controller support for the + Synopsys DesignWare USB OTG Core used on the Rockchip RK28. + +config USB_DWC_OTG + tristate + depends on USB_GADGET_DWC_OTG + default USB_GADGET + select USB_GADGET_SELECTED + config USB_GADGET_EG20T - boolean "Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH UDC" + tristate "Intel EG20T PCH/OKI SEMICONDUCTOR IOH(ML7213/ML7831) UDC" depends on PCI select USB_GADGET_DUALSPEED help diff --cc drivers/usb/gadget/composite.c index 6182f6d04519,1d88a80086a3..2e295e8c5567 mode 100755,100644..100755 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c diff --cc drivers/usb/gadget/f_accessory.c index 51ce8dfb5dca,1df88a6bf7ec..ee78a24d7ad5 mode 100755,100644..100755 --- a/drivers/usb/gadget/f_accessory.c +++ b/drivers/usb/gadget/f_accessory.c diff --cc drivers/usb/gadget/f_adb.c index 83e1f59385a2,1c0166c6df21..de61944d780f mode 100755,100644..100755 --- a/drivers/usb/gadget/f_adb.c +++ b/drivers/usb/gadget/f_adb.c diff --cc drivers/usb/gadget/f_mass_storage.c index ef0cd7fbe1a0,bc2f62476cbc..daea926edef3 mode 100755,100644..100755 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c diff --cc drivers/usb/serial/option.c index 8e8430342230,cbe3451cb351..a01fedbca7e6 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@@ -315,8 -319,10 +319,11 @@@ static void option_instat_callback(stru #define ZTE_PRODUCT_CDMA_TECH 0xfffe #define ZTE_PRODUCT_AC8710 0xfff1 #define ZTE_PRODUCT_AC2726 0xfff5 +#define ZTE_PRODUCT_AC100 0x0094 #define ZTE_PRODUCT_AC8710T 0xffff + #define ZTE_PRODUCT_MC2718 0xffe8 + #define ZTE_PRODUCT_AD3812 0xffeb + #define ZTE_PRODUCT_MC2716 0xffed #define BENQ_VENDOR_ID 0x04a5 #define BENQ_PRODUCT_H10 0x4068 @@@ -1023,12 -1102,13 +1120,18 @@@ static const struct usb_device_id optio { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xFFED, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xFFFE, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xFFEB, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xF006, 0xff, 0xff, 0xff) }, + { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_AC100)}, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2718, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&zte_mc2718_z_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AD3812, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&zte_ad3812_z_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2716, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&zte_mc2716_z_blacklist }, { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) }, { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) }, { USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5) }, /* Yes, ALINK_VENDOR_ID */ diff --cc drivers/usb/serial/usb-serial.c index bf8a940a353a,5d7b71b96148..c4fd197e2bd3 mode 100755,100644..100755 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@@ -1083,25 -1058,13 +1083,31 @@@ int usb_serial_probe(struct usb_interfa } else { serial->attached = 1; } +#ifdef CONFIG_MU509 + if ((le16_to_cpu(dev->descriptor.idVendor) == 0x12D1 ) && (le16_to_cpu(dev->descriptor.idProduct) == 0x1001)) + MU509_USB =1; + else + MU509_USB = 0; +#endif +#ifdef CONFIG_MW100 + if ((le16_to_cpu(dev->descriptor.idVendor) == 0x19f5) && (le16_to_cpu(dev->descriptor.idProduct) == 0x9013)) + MW100_USB =1; + else + MW100_USB = 0; +#endif +#ifdef CONFIG_MT6229 + if ((le16_to_cpu(dev->descriptor.idVendor) == 0x0E8D) && (le16_to_cpu(dev->descriptor.idProduct) == 0x00A2)) + MT6229_USB =1; + else + MT6229_USB = 0; +#endif + /* Avoid race with tty_open and serial_install by setting the + * disconnected flag and not clearing it until all ports have been + * registered. + */ + serial->disconnected = 1; + if (get_free_serial(serial, num_ports, &minor) == NULL) { dev_err(&interface->dev, "No more free serial devices\n"); goto probe_error; diff --cc drivers/video/fbmem.c index d9369a700dda,7a41220aebdd..ae7c4211f715 mode 100755,100644..100755 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c diff --cc fs/block_dev.c index fd91640369db,74fc5ed7de06..5f58e5ac6a40 mode 100755,100644..100755 --- a/fs/block_dev.c +++ b/fs/block_dev.c diff --cc fs/partitions/check.c index dc290f032250,811960a5ef6f..1648912c1a87 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c @@@ -550,29 -550,14 +550,23 @@@ static bool disk_unlock_native_capacity } } - int rescan_partitions(struct gendisk *disk, struct block_device *bdev) + static int drop_partitions(struct gendisk *disk, struct block_device *bdev) { - struct parsed_partitions *state = NULL; struct disk_part_iter piter; struct hd_struct *part; - int p, highest, res; - rescan: - if (state && !IS_ERR(state)) { - kfree(state); - state = NULL; - } + int res; if (bdev->bd_part_count) + { + #if defined(CONFIG_SDMMC_RK29) && !defined(CONFIG_SDMMC_RK29_OLD) + if(179 == MAJOR(bdev->bd_dev)) + { + printk(KERN_INFO "%s..%d.. The sdcard partition have been using.So device busy! \n",__FUNCTION__, __LINE__); + } + #endif + return -EBUSY; + } res = invalidate_partition(disk, 0); if (res) return res; diff --cc include/linux/fb.h index 0dcb6b4dc8d6,f9d013d09bc7..bbbe037fe041 mode 100755,100644..100755 --- a/include/linux/fb.h +++ b/include/linux/fb.h diff --cc sound/soc/codecs/wm8994.c index 5121b4341c31,219491237875..0c877ffeddcc mode 100755,100644..100755 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c diff --cc sound/soc/codecs/wm_hubs.c index e57d1d5c1dbc,8712a9f6d6ec..7fdb014ec2a5 mode 100755,100644..100755 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c