aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-24 11:46:01 -0800
committerMoyster <oysterized@gmail.com>2018-11-29 17:49:05 +0100
commit8588b01909e0145e5e84f5fe0a5353bd194f205c (patch)
tree2b958cb2fca998ae9b0af4fe0e8528f2394df7f0 /drivers
parentabb6dd37b6fcb473e8974fac2e9c6cfbaa83b038 (diff)
Replace <asm/uaccess.h> with <linux/uaccess.h> globally
This was entirely automated, using the script by Al: PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*<asm/uaccess.h>' sed -i -e "s!$PATT!#include <linux/uaccess.h>!" \ $(git grep -l "$PATT"|grep -v ^include/linux/uaccess.h) to do the replacement at the end of the merge window. Requested-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Moyster <oysterized@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/battery.c2
-rw-r--r--drivers/acpi/fan.c2
-rw-r--r--drivers/acpi/osl.c2
-rw-r--r--drivers/acpi/proc.c2
-rw-r--r--drivers/acpi/processor_driver.c2
-rw-r--r--drivers/acpi/processor_thermal.c2
-rw-r--r--drivers/acpi/processor_throttling.c2
-rw-r--r--drivers/acpi/sbs.c2
-rw-r--r--drivers/acpi/thermal.c2
-rw-r--r--drivers/acpi/video.c2
-rw-r--r--drivers/atm/adummy.c2
-rw-r--r--drivers/atm/atmtcp.c2
-rw-r--r--drivers/atm/eni.c2
-rw-r--r--drivers/atm/firestream.c2
-rw-r--r--drivers/atm/fore200e.c2
-rw-r--r--drivers/atm/he.c2
-rw-r--r--drivers/atm/horizon.c2
-rw-r--r--drivers/atm/idt77105.c2
-rw-r--r--drivers/atm/idt77252.c2
-rw-r--r--drivers/atm/iphase.c2
-rw-r--r--drivers/atm/nicstar.c2
-rw-r--r--drivers/atm/suni.c2
-rw-r--r--drivers/atm/uPD98402.c2
-rw-r--r--drivers/atm/zatm.c2
-rw-r--r--drivers/base/dma-contiguous.c2
-rw-r--r--drivers/base/memory.c2
-rw-r--r--drivers/block/DAC960.c2
-rw-r--r--drivers/block/amiflop.c2
-rw-r--r--drivers/block/brd.c2
-rw-r--r--drivers/block/cciss.c2
-rw-r--r--drivers/block/cpqarray.c2
-rw-r--r--drivers/block/cryptoloop.c2
-rw-r--r--drivers/block/drbd/drbd_main.c2
-rw-r--r--drivers/block/drbd/drbd_proc.c2
-rw-r--r--drivers/block/drbd/drbd_receiver.c2
-rw-r--r--drivers/block/hd.c2
-rw-r--r--drivers/block/loop.c2
-rw-r--r--drivers/block/nbd.c2
-rw-r--r--drivers/block/paride/pcd.c2
-rw-r--r--drivers/block/paride/pd.c2
-rw-r--r--drivers/block/paride/pf.c2
-rw-r--r--drivers/block/paride/pg.c2
-rw-r--r--drivers/block/paride/pt.c2
-rw-r--r--drivers/block/pktcdvd.c2
-rw-r--r--drivers/block/swim3.c2
-rw-r--r--drivers/block/sx8.c2
-rw-r--r--drivers/block/umem.c2
-rw-r--r--drivers/cdrom/cdrom.c2
-rw-r--r--drivers/char/agp/compat_ioctl.c2
-rw-r--r--drivers/char/agp/frontend.c2
-rw-r--r--drivers/char/applicom.c2
-rw-r--r--drivers/char/bfin-otp.c2
-rw-r--r--drivers/char/ds1620.c2
-rw-r--r--drivers/char/dtlk.c2
-rw-r--r--drivers/char/generic_nvram.c2
-rw-r--r--drivers/char/genrtc.c2
-rw-r--r--drivers/char/hangcheck-timer.c2
-rw-r--r--drivers/char/hw_random/core.c2
-rw-r--r--drivers/char/i8k.c2
-rw-r--r--drivers/char/ipmi/ipmi_watchdog.c2
-rw-r--r--drivers/char/lp.c2
-rw-r--r--drivers/char/mbcs.c2
-rw-r--r--drivers/char/mem.c2
-rw-r--r--drivers/char/mmtimer.c2
-rw-r--r--drivers/char/mwave/3780i.c2
-rw-r--r--drivers/char/mwave/mwavedd.h2
-rw-r--r--drivers/char/nsc_gpio.c2
-rw-r--r--drivers/char/nwbutton.c2
-rw-r--r--drivers/char/nwflash.c2
-rw-r--r--drivers/char/pc8736x_gpio.c2
-rw-r--r--drivers/char/pcmcia/cm4040_cs.c2
-rw-r--r--drivers/char/pcmcia/synclink_cs.c2
-rw-r--r--drivers/char/random.c2
-rw-r--r--drivers/char/raw.c2
-rw-r--r--drivers/char/scx200_gpio.c2
-rw-r--r--drivers/char/sonypi.c2
-rw-r--r--drivers/char/tlclk.c2
-rw-r--r--drivers/char/toshiba.c2
-rw-r--r--drivers/char/xilinx_hwicap/xilinx_hwicap.c2
-rw-r--r--drivers/cpufreq/ia64-acpi-cpufreq.c2
-rw-r--r--drivers/cpuidle/governors/ladder.c2
-rw-r--r--drivers/cpuidle/mtk_cpuidle_internal.c2
-rw-r--r--drivers/dio/dio.c2
-rw-r--r--drivers/dma/iovlock.c2
-rw-r--r--drivers/edac/edac_device.c2
-rw-r--r--drivers/edac/edac_mc.c2
-rw-r--r--drivers/edac/edac_pci.c2
-rw-r--r--drivers/i2c/i2c-core.c2
-rw-r--r--drivers/ide/hpt366.c2
-rw-r--r--drivers/ide/ide-disk.c2
-rw-r--r--drivers/ide/ide-io.c2
-rw-r--r--drivers/ide/ide-iops.c2
-rw-r--r--drivers/ide/ide-probe.c2
-rw-r--r--drivers/ide/ide-proc.c2
-rw-r--r--drivers/infiniband/core/ucm.c2
-rw-r--r--drivers/infiniband/core/user_mad.c2
-rw-r--r--drivers/infiniband/core/uverbs_cmd.c2
-rw-r--r--drivers/infiniband/core/uverbs_main.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_diag.c2
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_vlan.c2
-rw-r--r--drivers/infiniband/ulp/iser/iscsi_iser.c2
-rw-r--r--drivers/input/input-compat.c2
-rw-r--r--drivers/input/misc/atlas_btns.c2
-rw-r--r--drivers/input/mouse/amimouse.c2
-rw-r--r--drivers/input/mouse/atarimouse.c2
-rw-r--r--drivers/input/mouse/trackpoint.c2
-rw-r--r--drivers/input/serio/hp_sdc.c2
-rw-r--r--drivers/input/serio/q40kbd.c2
-rw-r--r--drivers/input/serio/serport.c2
-rw-r--r--drivers/input/tablet/aiptek.c2
-rw-r--r--drivers/input/tablet/gtco.c2
-rw-r--r--drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT1151/gt1x_extents.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT1151/gt1x_tools.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT1151/gt1x_update.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT813/gt813_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c4
-rw-r--r--drivers/input/touchscreen/mediatek/GT818B/goodix_tool.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c4
-rw-r--r--drivers/input/touchscreen/mediatek/GT819/gt819_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT910/goodix_tool.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT910/gt9xx_update.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT911/goodix_tool.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT911/gt9xx_update.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX/goodix_tool.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX/gt9xx_update.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_2/goodix_tool.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_update.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_aio/goodix_tool.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_update.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_hotknot/goodix_tool.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_update.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/goodix_tool.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_update.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/goodix_tool.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_update.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/goodix_tool.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_update.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/goodix_tool.c2
-rw-r--r--drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_update.c2
-rw-r--r--drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ctl.c2
-rw-r--r--drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.h2
-rw-r--r--drivers/input/touchscreen/mediatek/MZ_FT5346/tpd_custom_fts.h2
-rw-r--r--drivers/input/touchscreen/mediatek/MZ_GT9XX/goodix_tool.c2
-rw-r--r--drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_update.c2
-rw-r--r--drivers/input/touchscreen/mediatek/MZ_GT9XX/tpd_custom_gt9xx.h2
-rw-r--r--drivers/input/touchscreen/mediatek/S3203/s3203_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/ft5206/focaltech_ex_fun.h2
-rw-r--r--drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c2
-rw-r--r--drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c2
-rw-r--r--drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c2
-rw-r--r--drivers/input/touchscreen/mediatek/mms128/mms128_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/mms244/mms200_ts.c2
-rw-r--r--drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/mtk_tpd.c2
-rw-r--r--drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c2
-rw-r--r--drivers/input/touchscreen/mediatek/tpd_debug.c2
-rw-r--r--drivers/isdn/capi/kcapi.c2
-rw-r--r--drivers/isdn/hardware/avm/b1.c2
-rw-r--r--drivers/isdn/hardware/avm/b1dma.c2
-rw-r--r--drivers/isdn/hardware/avm/c4.c2
-rw-r--r--drivers/isdn/hardware/eicon/capimain.c2
-rw-r--r--drivers/isdn/hardware/eicon/divamnt.c2
-rw-r--r--drivers/isdn/hardware/eicon/divasi.c2
-rw-r--r--drivers/isdn/hardware/eicon/divasmain.c2
-rw-r--r--drivers/isdn/hardware/eicon/divasproc.c2
-rw-r--r--drivers/isdn/hysdn/hysdn_boot.c2
-rw-r--r--drivers/lguest/core.c2
-rw-r--r--drivers/lguest/page_tables.c2
-rw-r--r--drivers/lguest/x86/core.c2
-rw-r--r--drivers/macintosh/adb.c2
-rw-r--r--drivers/macintosh/ans-lcd.c2
-rw-r--r--drivers/macintosh/nvram.c2
-rw-r--r--drivers/macintosh/smu.c2
-rw-r--r--drivers/macintosh/via-pmu.c2
-rw-r--r--drivers/macintosh/via-pmu68k.c2
-rw-r--r--drivers/md/dm-ioctl.c2
-rw-r--r--drivers/media/dvb-core/dmxdev.c2
-rw-r--r--drivers/media/dvb-core/dvb_demux.c2
-rw-r--r--drivers/media/dvb-core/dvb_net.c2
-rw-r--r--drivers/media/dvb-core/dvb_ringbuffer.c2
-rw-r--r--drivers/media/i2c/adv7170.c2
-rw-r--r--drivers/media/i2c/adv7175.c2
-rw-r--r--drivers/media/i2c/bt856.c2
-rw-r--r--drivers/media/i2c/bt866.c2
-rw-r--r--drivers/media/i2c/cs53l32a.c2
-rw-r--r--drivers/media/i2c/m52790.c2
-rw-r--r--drivers/media/i2c/saa6588.c2
-rw-r--r--drivers/media/i2c/saa7110.c2
-rw-r--r--drivers/media/i2c/saa7185.c2
-rw-r--r--drivers/media/i2c/tlv320aic23b.c2
-rw-r--r--drivers/media/i2c/vp27smpx.c2
-rw-r--r--drivers/media/i2c/vpx3220.c2
-rw-r--r--drivers/media/i2c/wm8739.c2
-rw-r--r--drivers/media/i2c/wm8775.c2
-rw-r--r--drivers/media/parport/bw-qcam.c2
-rw-r--r--drivers/media/parport/c-qcam.c2
-rw-r--r--drivers/media/pci/ivtv/ivtv-driver.h2
-rw-r--r--drivers/media/pci/meye/meye.c2
-rw-r--r--drivers/media/pci/zoran/videocodec.c2
-rw-r--r--drivers/media/pci/zoran/zoran_driver.c2
-rw-r--r--drivers/media/platform/arv.c2
-rw-r--r--drivers/media/usb/pvrusb2/pvrusb2-ioread.c2
-rw-r--r--drivers/media/usb/pwc/pwc-ctrl.c2
-rw-r--r--drivers/media/usb/sn9c102/sn9c102_core.c2
-rw-r--r--drivers/media/v4l2-core/v4l2-common.c2
-rw-r--r--drivers/media/v4l2-core/v4l2-dev.c2
-rw-r--r--drivers/message/fusion/mptctl.c2
-rw-r--r--drivers/message/fusion/mptlan.h2
-rw-r--r--drivers/message/i2o/config-osm.c2
-rw-r--r--drivers/message/i2o/i2o_config.c2
-rw-r--r--drivers/message/i2o/i2o_proc.c2
-rw-r--r--drivers/misc/ibmasm/ibmasmfs.c2
-rw-r--r--drivers/misc/ltr559.c2
-rw-r--r--drivers/misc/mediatek/accdet/mt6735/accdet.h4
-rw-r--r--drivers/misc/mediatek/accdet/mt6735/accdet_hal.h4
-rw-r--r--drivers/misc/mediatek/accdet/mt6735/ts3a225e.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/KXTJ2_1009-new/kxtj2_1009.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/KXTJ2_1009/kxtj2_1009.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/bma050-new/bma050.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/bma050/bma050.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/bma056/bma056.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/bma222E-new/bma222E.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/bma222E/bma222E.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/bma250/bma250.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/bma250e/bma250.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/bma255-sdo0/bma255.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/bma255-sdo1/bma255.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/da213/mir3da_cust.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/inc/accel_factory.h2
-rw-r--r--drivers/misc/mediatek/accelerometer/k2dh/k2dh.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/kxtik1004/kxtik1004.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/lsm6ds3/lsm6ds3.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/mc3410-new/mc3410.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/mc3xxx_auto/mc3xxx.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/mpu6050g-new/mpu6050.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/mpu6050g/mpu6050.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/mpu6050g/mpu6xxx_hwselftest.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/mpu60x0/mpu60x0.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/mpu6515/mpu6515.c2
-rw-r--r--drivers/misc/mediatek/accelerometer/mxc400x-new/mxc400x.c2
-rw-r--r--drivers/misc/mediatek/aee/aed/aed-debug.c2
-rw-r--r--drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c2
-rw-r--r--drivers/misc/mediatek/alsps/APDS9930/APDS9930.c2
-rw-r--r--drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c2
-rw-r--r--drivers/misc/mediatek/alsps/aal_control.c2
-rw-r--r--drivers/misc/mediatek/alsps/apm_16d/apm_16d.c2
-rw-r--r--drivers/misc/mediatek/alsps/cm3232-new/cm3232.c2
-rw-r--r--drivers/misc/mediatek/alsps/cm36283-new/cm36283.c2
-rw-r--r--drivers/misc/mediatek/alsps/cm36283/cm36283.c2
-rw-r--r--drivers/misc/mediatek/alsps/cm36652-new/cm36652.c2
-rw-r--r--drivers/misc/mediatek/alsps/epl2182/epl2182.c2
-rw-r--r--drivers/misc/mediatek/alsps/inc/alsps_factory.h2
-rw-r--r--drivers/misc/mediatek/alsps/rpr410/rpr410.c2
-rw-r--r--drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c2
-rw-r--r--drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c2
-rw-r--r--drivers/misc/mediatek/alsps/tmd2771/tmd2771.c2
-rw-r--r--drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c2
-rw-r--r--drivers/misc/mediatek/auxadc/mt6735/mt_auxadc_hal.c2
-rw-r--r--drivers/misc/mediatek/auxadc/mt_auxadc.c2
-rw-r--r--drivers/misc/mediatek/barometer/inc/barometer_factory.h2
-rw-r--r--drivers/misc/mediatek/barometer/ms5607/ms5607.c2
-rw-r--r--drivers/misc/mediatek/btcvsd/mt6735/AudDrv_BTCVSD.c2
-rw-r--r--drivers/misc/mediatek/bthid/hid_keyboard.c2
-rw-r--r--drivers/misc/mediatek/ccci_util/ccci_private_log.c2
-rw-r--r--drivers/misc/mediatek/connectivity/common/combo/core/stp_exp.c2
-rw-r--r--drivers/misc/mediatek/connectivity/common/combo/linux/include/osal.h2
-rw-r--r--drivers/misc/mediatek/connectivity/common/combo/linux/stp_chrdev_bt.c2
-rw-r--r--drivers/misc/mediatek/connectivity/common/combo/linux/wmt_chrdev_wifi.c2
-rw-r--r--drivers/misc/mediatek/connectivity/common/common_detect/wmt_detect.h2
-rw-r--r--drivers/misc/mediatek/connectivity/common/common_detect/wmt_stp_exp.h2
-rw-r--r--drivers/misc/mediatek/connectivity/common/conn_soc/linux/include/osal_typedef.h2
-rw-r--r--drivers/misc/mediatek/connectivity/common/conn_soc/linux/pri/stp_exp.c2
-rw-r--r--drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/stp_chrdev_bt.c2
-rw-r--r--drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/wmt_chrdev_wifi.c2
-rw-r--r--drivers/misc/mediatek/connectivity/gps/gps.c2
-rw-r--r--drivers/misc/mediatek/connectivity/gps/stp_chrdev_gps.c2
-rw-r--r--drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/hif/ahb/mt6735/ahb_pdma.c2
-rw-r--r--drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/include/gl_os.h2
-rw-r--r--drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/include/gl_os.h2
-rw-r--r--drivers/misc/mediatek/devinfo/mt6735/devinfo.c2
-rw-r--r--drivers/misc/mediatek/devinfo/mt6735/devinfosys.c2
-rw-r--r--drivers/misc/mediatek/dispsys/mt6735/ddp_aal.c2
-rw-r--r--drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.c2
-rw-r--r--drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.h2
-rw-r--r--drivers/misc/mediatek/dispsys/mt6735/ddp_od.c2
-rw-r--r--drivers/misc/mediatek/eemcs/eemcs_file_ops.c2
-rw-r--r--drivers/misc/mediatek/eemcs/eemcs_file_ops.h2
-rw-r--r--drivers/misc/mediatek/ext_disp/mt6735/extd_factory.c2
-rw-r--r--drivers/misc/mediatek/ext_disp/mt6735/extd_hdmi_drv.c2
-rw-r--r--drivers/misc/mediatek/ext_disp/mt6735/mtk_ext_disp_mgr.c2
-rw-r--r--drivers/misc/mediatek/flashlight/src/mt6735/constant_flashlight/leds_strobe.c2
-rw-r--r--drivers/misc/mediatek/flashlight/src/mt6735/dummy_flashlight/dummy_flashlight.c2
-rw-r--r--drivers/misc/mediatek/flashlight/src/mt6735/kd_flashlightlist.c2
-rw-r--r--drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid1_part2.c2
-rw-r--r--drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part1.c2
-rw-r--r--drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part2.c2
-rw-r--r--drivers/misc/mediatek/flashlight/src/mt6735/strobe_part_id.c2
-rw-r--r--drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid1_part2.c2
-rw-r--r--drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part1.c2
-rw-r--r--drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part2.c2
-rw-r--r--drivers/misc/mediatek/flashlight/src/mt6735/sub_strobe.c2
-rw-r--r--drivers/misc/mediatek/gpio/mt_gpio_core.c2
-rw-r--r--drivers/misc/mediatek/gpu/ged/src/ged_base.c2
-rw-r--r--drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/dma_buf_lock/src/dma_buf_lock.c2
-rw-r--r--drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/ump/src/linux/ump_kernel_linux.c2
-rw-r--r--drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c2
-rw-r--r--drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/dma_buf_lock/src/dma_buf_lock.c2
-rw-r--r--drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/ump/src/linux/ump_kernel_linux.c2
-rw-r--r--drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c2
-rw-r--r--drivers/misc/mediatek/gyroscope/ITG1010-new/ITG1010.c2
-rw-r--r--drivers/misc/mediatek/gyroscope/inc/gyro_factory.h2
-rw-r--r--drivers/misc/mediatek/gyroscope/l3g4200d/l3g4200d.c2
-rw-r--r--drivers/misc/mediatek/gyroscope/l3gd20/l3gd20.c2
-rw-r--r--drivers/misc/mediatek/gyroscope/lsm6ds0/lsm6ds0.c2
-rw-r--r--drivers/misc/mediatek/gyroscope/lsm6ds3gy/lsm6ds3_gy.c2
-rw-r--r--drivers/misc/mediatek/gyroscope/mpu3000-new/mpu3000.c2
-rw-r--r--drivers/misc/mediatek/gyroscope/mpu3000/mpu3000.c2
-rw-r--r--drivers/misc/mediatek/gyroscope/mpu3050c-new/mpu3050c.c2
-rw-r--r--drivers/misc/mediatek/gyroscope/mpu3050c/mpu3050c.c2
-rw-r--r--drivers/misc/mediatek/gyroscope/mpu6050c/mpu6050c.c2
-rw-r--r--drivers/misc/mediatek/gyroscope/mpu6050gy-new/mpu6050.c2
-rw-r--r--drivers/misc/mediatek/gyroscope/mpu6050gy/mpu6050.c2
-rw-r--r--drivers/misc/mediatek/gyroscope/mpu6515/mpu6515.c2
-rw-r--r--drivers/misc/mediatek/hdmi/Sii8338/mhl_linuxdrv_ioctl.c2
-rw-r--r--drivers/misc/mediatek/hdmi/Sii8338/smartbook.c2
-rw-r--r--drivers/misc/mediatek/hdmi/Sii8348/mhl_linux_tx.c2
-rw-r--r--drivers/misc/mediatek/hdmi/Sii8348/smartbook.c2
-rw-r--r--drivers/misc/mediatek/hdmi/mt8193/hdmi_drv.c2
-rw-r--r--drivers/misc/mediatek/hdmi/mt8193/mt8193_ctrl.h2
-rw-r--r--drivers/misc/mediatek/hdmi/mt8193/mt8193avd.h2
-rw-r--r--drivers/misc/mediatek/hdmi/mt8193/mt8193cec.c2
-rw-r--r--drivers/misc/mediatek/hdmi/mt8193/mt8193edid.c2
-rw-r--r--drivers/misc/mediatek/hdmi/mt8193/mt8193hdmictrl.h2
-rw-r--r--drivers/misc/mediatek/hdmi/nxp_tda19989/hdmi_drv.c8
-rw-r--r--drivers/misc/mediatek/hdmi/nxp_tda19989/tmdlHdmiTx_cfg.c2
-rw-r--r--drivers/misc/mediatek/hdmi/sil9024/hdmi_drv.c2
-rw-r--r--drivers/misc/mediatek/hwmon/batchsen/batch.c2
-rw-r--r--drivers/misc/mediatek/hwmon/hwmsen/hwmsen_dev.c2
-rw-r--r--drivers/misc/mediatek/hwmon/hwmsen/hwmsen_helper.c2
-rw-r--r--drivers/misc/mediatek/kernel/mtk_memcfg.c2
-rw-r--r--drivers/misc/mediatek/kernel/sec_osal.c2
-rw-r--r--drivers/misc/mediatek/lcm/cpt_clap070wp03xg_sn65dsi83/sn65dsi83_i2c.c2
-rw-r--r--drivers/misc/mediatek/lcm/it6121_g156xw01v1_lvds_vdo/it6121_i2c.c2
-rw-r--r--drivers/misc/mediatek/lcm/it6151_edp_dsi_video_sharp/it6151_i2c.c2
-rw-r--r--drivers/misc/mediatek/lcm/it6151_fhd_edp_dsi_video_auo/it6151_i2c.c2
-rw-r--r--drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video/it6151_i2c.c2
-rw-r--r--drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video_8163evb/it6151_i2c.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/camera_fdvt_D1.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/cpu_hibernate.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/fliper/fliper.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/hibernate64.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/include/mach/mt_thermal.h2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/sound/yusu_android_speaker.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_generic.h2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_tpd_custom.h2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/sound/yusu_android_speaker.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_generic.h2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_tpd_custom.h2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_clkmgr.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_clkmgr2.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_clkmgr3.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_clkmgr_legacy.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_cpu_ss.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_gpufreq.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_pm_init.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_pm_ldo.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/af7133/af7133.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/akm09911-new/akm09911.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/akm09911/akm09911.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/akm8963-new/akm8963.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/akm8963/akm8963.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/akm8975/akm8975.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/akm8975_auto/akm8975.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/ami304/ami304.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/ami304_auto/ami304.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/bmm050-new/bmm050.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/bmm050/bmm050.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/bmm056-new/bmm056.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/bmm056/bmm056.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/bmm150/bmm150.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/hscdtd006/hscdtd006.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/hscdtd006_auto/hscdtd006_auto.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/inc/mag_factory.h2
-rw-r--r--drivers/misc/mediatek/magnetometer/ist8303-new/ist8303.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/lsm303c-new/lsm303c.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/lsm303m/lsm303m.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/mag3110/mag3110.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/mc41xx/mc41xx.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/mc6420/mc6420.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/mc64xx/mc64xx.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/mmc328x/mmc328x.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/mmc328x_auto/mmc328x.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/mmc328xma/mmc328x.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/mmc3416x/mmc3416x.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/qmc5983/qmc5983.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/s62x/s62x.c2
-rw-r--r--drivers/misc/mediatek/magnetometer/st480/st480.h2
-rw-r--r--drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.h2
-rw-r--r--drivers/misc/mediatek/masp/asfv2/core/sec_mod_core.c2
-rw-r--r--drivers/misc/mediatek/masp/asfv2/core/sec_osal.c2
-rw-r--r--drivers/misc/mediatek/masp/asfv2/module/sec_mod.c2
-rw-r--r--drivers/misc/mediatek/masp/mt6735/module/sec_mod.c2
-rw-r--r--drivers/misc/mediatek/mjc/mt6735/mjc_kernel_driver.c2
-rw-r--r--drivers/misc/mediatek/mlog/mlog_logger.c2
-rw-r--r--drivers/misc/mediatek/mmc-host/emmc_rpmb.c2
-rw-r--r--drivers/misc/mediatek/mmc-host/mt6735/emmc_otp.c2
-rw-r--r--drivers/misc/mediatek/mmc-host/mt6735/mt_sd_misc.c2
-rw-r--r--drivers/misc/mediatek/mmp/dummy/mmprofile.c2
-rw-r--r--drivers/misc/mediatek/mtprof/auto_tune.c2
-rw-r--r--drivers/misc/mediatek/mtprof/bootprof.c2
-rw-r--r--drivers/misc/mediatek/mtprof/lockprof.c2
-rw-r--r--drivers/misc/mediatek/mtprof/monitor_debug_out.c2
-rw-r--r--drivers/misc/mediatek/mtprof/mt_debug_config.c2
-rw-r--r--drivers/misc/mediatek/mtprof/mt_printk_ctrl.c2
-rw-r--r--drivers/misc/mediatek/mtprof/mt_prv_lock.c2
-rw-r--r--drivers/misc/mediatek/mtprof/prof_ctl.c2
-rw-r--r--drivers/misc/mediatek/mtprof/prof_main.c2
-rw-r--r--drivers/misc/mediatek/mtprof/sched_monitor.c2
-rw-r--r--drivers/misc/mediatek/mu3d/drv/musb_core.c2
-rw-r--r--drivers/misc/mediatek/mu3d/drv/musb_debugfs.c2
-rw-r--r--drivers/misc/mediatek/mu3d/test_drv/mu3d_test_test.c2
-rw-r--r--drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193.h2
-rw-r--r--drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_gpio.h2
-rw-r--r--drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_pinmux.h2
-rw-r--r--drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_ckgen.c2
-rw-r--r--drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_gpio.c8
-rw-r--r--drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_iic.c8
-rw-r--r--drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_pinmux.c8
-rw-r--r--drivers/misc/mediatek/nand/mt6735/mtk_nand.c2
-rw-r--r--drivers/misc/mediatek/nand/mt6735/partition_mt.c2
-rw-r--r--drivers/misc/mediatek/pa/pa.c2
-rw-r--r--drivers/misc/mediatek/pa_hmp/pa.c2
-rw-r--r--drivers/misc/mediatek/partition/mt6735/efi.c2
-rw-r--r--drivers/misc/mediatek/partition/mt6735/partition.c2
-rw-r--r--drivers/misc/mediatek/power-loss-test/mt6735/power_loss_test.c2
-rw-r--r--drivers/misc/mediatek/power/mt6735/bq24261.c2
-rw-r--r--drivers/misc/mediatek/power/mt6735/bq24296.c2
-rw-r--r--drivers/misc/mediatek/power/mt6735/fan5405.c2
-rw-r--r--drivers/misc/mediatek/power/mt6735/max77819_pmic.c2
-rw-r--r--drivers/misc/mediatek/power/mt6735/mt6311.c2
-rw-r--r--drivers/misc/mediatek/power/mt6735/ncp1854.c2
-rw-r--r--drivers/misc/mediatek/power/mt6735/pmic.c2
-rw-r--r--drivers/misc/mediatek/power/mt6735/pmic_auxadc.c2
-rw-r--r--drivers/misc/mediatek/power/mt6735/pmic_chr_type_det.c2
-rw-r--r--drivers/misc/mediatek/power/mt6735/pmic_dvt.c2
-rw-r--r--drivers/misc/mediatek/power/mt6735/pmic_otg_type_det.c2
-rw-r--r--drivers/misc/mediatek/power/mt6735/tps6128x.c2
-rw-r--r--drivers/misc/mediatek/pwm/mt6735/mt_pwm_hal.c2
-rw-r--r--drivers/misc/mediatek/pwm/mt_pwm.c2
-rw-r--r--drivers/misc/mediatek/secmem/mt6735/secmem.c2
-rw-r--r--drivers/misc/mediatek/secwidevine/classicdrm/secwidevine.c2
-rw-r--r--drivers/misc/mediatek/sensorHub/CwMcuSensor/CwMcuSensor_factory.c2
-rw-r--r--drivers/misc/mediatek/sensorHub/SCP_sensorHub/SCP_sensorHub.c2
-rw-r--r--drivers/misc/mediatek/sensorHub/SCP_shf/shf_kernel.c2
-rw-r--r--drivers/misc/mediatek/ssw/inc/ssw.h2
-rw-r--r--drivers/misc/mediatek/sysenv/mt6735/sysenv.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amddulthro.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amdtxctrl.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amutt.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_cooler_bcct.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddtxpwr.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddulthro.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdtxpwr.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdulthro.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mutt.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_thermal_dummy.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_thermal_platform.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_ts_battery.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_ts_bts.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_ts_btsmdpa.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa_thput.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/mtk_ts_wmt.c2
-rw-r--r--drivers/misc/mediatek/thermal/mt6735/tm_nth.c2
-rw-r--r--drivers/misc/mediatek/thermal/mtk_cooler_cam.c2
-rw-r--r--drivers/misc/mediatek/thermal/mtk_cooler_shutdown.c2
-rw-r--r--drivers/misc/mediatek/thermal/mtk_cooler_vrt.c2
-rw-r--r--drivers/misc/mediatek/thermal/mtk_thermal_monitor.c2
-rw-r--r--drivers/misc/mediatek/trustzone/tz_fileio.c2
-rw-r--r--drivers/misc/mediatek/trustzone/tz_fileio.h2
-rw-r--r--drivers/misc/mediatek/uibc/uibc.c2
-rw-r--r--drivers/misc/mediatek/usb11/mt6735/musbfsh_debugfs.c2
-rw-r--r--drivers/misc/mediatek/usb20/mt6735/usb20_otg_if.c2
-rw-r--r--drivers/misc/mediatek/usb20/mt6735/usb20_phy_debugfs.c2
-rw-r--r--drivers/misc/mediatek/usb20/musb_debugfs.c2
-rw-r--r--drivers/misc/mediatek/vdec/vdec.c2
-rw-r--r--drivers/misc/mediatek/vdec/verify/sata_fs_io.c2
-rw-r--r--drivers/misc/mediatek/vdec/verify/usb_io.c2
-rw-r--r--drivers/misc/mediatek/vdec/verify/vdec_verify_filesetting.c2
-rw-r--r--drivers/misc/mediatek/vdec/verify/vdec_verify_vdecode.c2
-rw-r--r--drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D1.c2
-rw-r--r--drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D2.c2
-rw-r--r--drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D3.c2
-rw-r--r--drivers/misc/mediatek/videox/mt6735/mtkfb.c2
-rw-r--r--drivers/misc/mediatek/vow/mt6735/vow.c2
-rw-r--r--drivers/misc/mediatek/wdk/wdt_test.c2
-rw-r--r--drivers/misc/mediatek/wdt/mt6735/mtk_wdt.c2
-rw-r--r--drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h2
-rw-r--r--drivers/misc/mediatek/xhci/xhci-mtk.c2
-rw-r--r--drivers/misc/mediatek/xhci_test/mtk-test.c2
-rw-r--r--drivers/mmc/card/block.c2
-rw-r--r--drivers/mmc/host/android-goldfish.c2
-rw-r--r--drivers/mtd/devices/pmc551.c2
-rw-r--r--drivers/mtd/devices/slram.c2
-rw-r--r--drivers/mtd/ftl.c2
-rw-r--r--drivers/mtd/inftlcore.c2
-rw-r--r--drivers/mtd/inftlmount.c2
-rw-r--r--drivers/mtd/maps/sun_uflash.c2
-rw-r--r--drivers/mtd/mtd_blkdevs.c2
-rw-r--r--drivers/mtd/mtdchar.c2
-rw-r--r--drivers/mtd/mtdpart.c2
-rw-r--r--drivers/mtd/nftlcore.c2
-rw-r--r--drivers/net/appletalk/ipddp.c2
-rw-r--r--drivers/net/eql.c2
-rw-r--r--drivers/net/ethernet/3com/3c509.c2
-rw-r--r--drivers/net/ethernet/3com/3c515.c2
-rw-r--r--drivers/net/ethernet/3com/3c574_cs.c2
-rw-r--r--drivers/net/ethernet/3com/3c589_cs.c2
-rw-r--r--drivers/net/ethernet/3com/3c59x.c2
-rw-r--r--drivers/net/ethernet/3com/typhoon.c2
-rw-r--r--drivers/net/ethernet/8390/axnet_cs.c2
-rw-r--r--drivers/net/ethernet/8390/ne2k-pci.c2
-rw-r--r--drivers/net/ethernet/8390/pcnet_cs.c2
-rw-r--r--drivers/net/ethernet/adaptec/starfire.c2
-rw-r--r--drivers/net/ethernet/alteon/acenic.c2
-rw-r--r--drivers/net/ethernet/amd/amd8111e.c2
-rw-r--r--drivers/net/ethernet/amd/nmclan_cs.c2
-rw-r--r--drivers/net/ethernet/broadcom/b44.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb/cxgb2.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c2
-rw-r--r--drivers/net/ethernet/dec/tulip/de2104x.c2
-rw-r--r--drivers/net/ethernet/dec/tulip/de4x5.c2
-rw-r--r--drivers/net/ethernet/dec/tulip/dmfe.c2
-rw-r--r--drivers/net/ethernet/dec/tulip/tulip_core.c2
-rw-r--r--drivers/net/ethernet/dec/tulip/uli526x.c2
-rw-r--r--drivers/net/ethernet/dec/tulip/winbond-840.c2
-rw-r--r--drivers/net/ethernet/dec/tulip/xircom_cb.c2
-rw-r--r--drivers/net/ethernet/dlink/dl2k.h2
-rw-r--r--drivers/net/ethernet/dlink/sundance.c2
-rw-r--r--drivers/net/ethernet/fealnx.c2
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c2
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/mac-fcc.c2
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/mac-fec.c2
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/mac-scc.c2
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/mii-fec.c2
-rw-r--r--drivers/net/ethernet/freescale/gianfar.c2
-rw-r--r--drivers/net/ethernet/freescale/gianfar.h2
-rw-r--r--drivers/net/ethernet/freescale/gianfar_ethtool.c2
-rw-r--r--drivers/net/ethernet/freescale/gianfar_sysfs.c2
-rw-r--r--drivers/net/ethernet/freescale/ucc_geth.c2
-rw-r--r--drivers/net/ethernet/freescale/ucc_geth_ethtool.c2
-rw-r--r--drivers/net/ethernet/fujitsu/fmvj18x_cs.c2
-rw-r--r--drivers/net/ethernet/ibm/emac/core.c2
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_ethtool.c2
-rw-r--r--drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c2
-rw-r--r--drivers/net/ethernet/natsemi/natsemi.c2
-rw-r--r--drivers/net/ethernet/natsemi/ns83820.c2
-rw-r--r--drivers/net/ethernet/packetengines/hamachi.c2
-rw-r--r--drivers/net/ethernet/packetengines/yellowfin.c2
-rw-r--r--drivers/net/ethernet/realtek/8139cp.c2
-rw-r--r--drivers/net/ethernet/sgi/ioc3-eth.c2
-rw-r--r--drivers/net/ethernet/sis/sis900.c2
-rw-r--r--drivers/net/ethernet/smsc/epic100.c2
-rw-r--r--drivers/net/ethernet/smsc/smc91c92_cs.c2
-rw-r--r--drivers/net/ethernet/sun/cassini.c2
-rw-r--r--drivers/net/ethernet/sun/sungem.c2
-rw-r--r--drivers/net/ethernet/sun/sunhme.c2
-rw-r--r--drivers/net/ethernet/via/via-rhine.c2
-rw-r--r--drivers/net/ethernet/xircom/xirc2ps_cs.c2
-rw-r--r--drivers/net/fddi/skfp/skfddi.c2
-rw-r--r--drivers/net/hamradio/6pack.c2
-rw-r--r--drivers/net/hamradio/baycom_epp.c2
-rw-r--r--drivers/net/hamradio/baycom_par.c2
-rw-r--r--drivers/net/hamradio/baycom_ser_fdx.c2
-rw-r--r--drivers/net/hamradio/baycom_ser_hdx.c2
-rw-r--r--drivers/net/hamradio/bpqether.c2
-rw-r--r--drivers/net/hamradio/dmascc.c2
-rw-r--r--drivers/net/hamradio/hdlcdrv.c2
-rw-r--r--drivers/net/hamradio/mkiss.c2
-rw-r--r--drivers/net/hamradio/scc.c2
-rw-r--r--drivers/net/hamradio/yam.c2
-rw-r--r--drivers/net/hippi/rrunner.c2
-rw-r--r--drivers/net/irda/irtty-sir.c2
-rw-r--r--drivers/net/irda/kingsun-sir.c2
-rw-r--r--drivers/net/irda/ks959-sir.c2
-rw-r--r--drivers/net/irda/ksdazzle-sir.c2
-rw-r--r--drivers/net/irda/mcs7780.c2
-rw-r--r--drivers/net/irda/vlsi_ir.c2
-rw-r--r--drivers/net/loopback.c2
-rw-r--r--drivers/net/phy/cicada.c2
-rw-r--r--drivers/net/phy/davicom.c2
-rw-r--r--drivers/net/phy/icplus.c2
-rw-r--r--drivers/net/phy/lxt.c2
-rw-r--r--drivers/net/phy/marvell.c2
-rw-r--r--drivers/net/phy/mdio_bus.c2
-rw-r--r--drivers/net/phy/phy.c2
-rw-r--r--drivers/net/phy/phy_device.c2
-rw-r--r--drivers/net/phy/qsemi.c2
-rw-r--r--drivers/net/ppp/ppp_async.c2
-rw-r--r--drivers/net/ppp/ppp_synctty.c2
-rw-r--r--drivers/net/ppp/pppoe.c2
-rw-r--r--drivers/net/ppp/pppolac.c2
-rw-r--r--drivers/net/ppp/pppopns.c2
-rw-r--r--drivers/net/ppp/pppox.c2
-rw-r--r--drivers/net/sb1000.c2
-rw-r--r--drivers/net/slip/slhc.c2
-rw-r--r--drivers/net/slip/slip.c2
-rw-r--r--drivers/net/tun.c2
-rw-r--r--drivers/net/usb/catc.c2
-rw-r--r--drivers/net/usb/kaweth.c2
-rw-r--r--drivers/net/usb/pegasus.c2
-rw-r--r--drivers/net/usb/rtl8150.c2
-rw-r--r--drivers/net/wan/dlci.c2
-rw-r--r--drivers/net/wan/dscc4.c2
-rw-r--r--drivers/net/wan/farsync.c2
-rw-r--r--drivers/net/wan/hd64570.c2
-rw-r--r--drivers/net/wan/hd64572.c2
-rw-r--r--drivers/net/wan/lapbether.c2
-rw-r--r--drivers/net/wan/lmc/lmc_main.c2
-rw-r--r--drivers/net/wan/lmc/lmc_media.c2
-rw-r--r--drivers/net/wan/sbni.c2
-rw-r--r--drivers/net/wan/sdla.c2
-rw-r--r--drivers/net/wireless/airo.c2
-rw-r--r--drivers/net/wireless/atmel.c2
-rw-r--r--drivers/net/wireless/hostap/hostap_hw.c2
-rw-r--r--drivers/net/wireless/hostap/hostap_main.c2
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2100.c2
-rw-r--r--drivers/net/wireless/ipw2x00/libipw_geo.c2
-rw-r--r--drivers/net/wireless/ipw2x00/libipw_module.c2
-rw-r--r--drivers/net/wireless/ipw2x00/libipw_rx.c2
-rw-r--r--drivers/net/wireless/ipw2x00/libipw_tx.c2
-rw-r--r--drivers/net/wireless/prism54/isl_38xx.c2
-rw-r--r--drivers/net/wireless/prism54/isl_ioctl.c2
-rw-r--r--drivers/net/wireless/ray_cs.c2
-rw-r--r--drivers/net/wireless/wl3501_cs.c2
-rw-r--r--drivers/nubus/proc.c2
-rw-r--r--drivers/oprofile/event_buffer.c2
-rw-r--r--drivers/oprofile/oprofilefs.c2
-rw-r--r--drivers/parisc/ccio-dma.c2
-rw-r--r--drivers/parisc/ccio-rm-dma.c2
-rw-r--r--drivers/parisc/eisa_eeprom.c2
-rw-r--r--drivers/parisc/eisa_enumerator.c2
-rw-r--r--drivers/parisc/led.c2
-rw-r--r--drivers/parisc/pdc_stable.c2
-rw-r--r--drivers/parport/daisy.c2
-rw-r--r--drivers/parport/ieee1284_ops.c2
-rw-r--r--drivers/parport/parport_gsc.c2
-rw-r--r--drivers/parport/probe.c2
-rw-r--r--drivers/parport/procfs.c2
-rw-r--r--drivers/pci/hotplug/acpiphp_ibm.c2
-rw-r--r--drivers/pci/hotplug/cpqphp_core.c2
-rw-r--r--drivers/pci/hotplug/cpqphp_nvram.c2
-rw-r--r--drivers/pci/hotplug/pci_hotplug_core.c2
-rw-r--r--drivers/pci/proc.c2
-rw-r--r--drivers/pci/syscall.c2
-rw-r--r--drivers/platform/x86/sony-laptop.c2
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c2
-rw-r--r--drivers/platform/x86/toshiba_acpi.c2
-rw-r--r--drivers/pnp/interface.c2
-rw-r--r--drivers/pnp/isapnp/proc.c2
-rw-r--r--drivers/pnp/pnpbios/proc.c2
-rw-r--r--drivers/power/mediatek/battery_common.c2
-rw-r--r--drivers/power/mediatek/battery_common_fg_20.c2
-rw-r--r--drivers/power/mediatek/battery_meter.c2
-rw-r--r--drivers/power/mediatek/battery_meter_fg_20.c2
-rw-r--r--drivers/rtc/rtc-at91rm9200.c2
-rw-r--r--drivers/rtc/rtc-vr41xx.c2
-rw-r--r--drivers/s390/block/dasd_devmap.c2
-rw-r--r--drivers/s390/block/dasd_eckd.c2
-rw-r--r--drivers/s390/block/dasd_eer.c2
-rw-r--r--drivers/s390/block/dasd_erp.c2
-rw-r--r--drivers/s390/block/dasd_genhd.c2
-rw-r--r--drivers/s390/block/dasd_ioctl.c2
-rw-r--r--drivers/s390/block/dasd_proc.c2
-rw-r--r--drivers/s390/block/xpram.c2
-rw-r--r--drivers/s390/char/con3215.c2
-rw-r--r--drivers/s390/char/keyboard.c2
-rw-r--r--drivers/s390/char/monreader.c2
-rw-r--r--drivers/s390/char/monwriter.c2
-rw-r--r--drivers/s390/char/sclp_rw.c2
-rw-r--r--drivers/s390/char/sclp_tty.c2
-rw-r--r--drivers/s390/char/sclp_vt220.c2
-rw-r--r--drivers/s390/char/tape_char.c2
-rw-r--r--drivers/s390/char/tty3270.c2
-rw-r--r--drivers/s390/char/vmcp.c2
-rw-r--r--drivers/s390/char/vmlogrdr.c2
-rw-r--r--drivers/s390/char/vmur.c2
-rw-r--r--drivers/s390/char/vmwatchdog.c2
-rw-r--r--drivers/s390/char/zcore.c2
-rw-r--r--drivers/s390/cio/blacklist.c2
-rw-r--r--drivers/s390/crypto/zcrypt_api.c2
-rw-r--r--drivers/s390/crypto/zcrypt_cex2a.c2
-rw-r--r--drivers/s390/crypto/zcrypt_pcica.c2
-rw-r--r--drivers/s390/crypto/zcrypt_pcicc.c2
-rw-r--r--drivers/s390/crypto/zcrypt_pcixcc.c2
-rw-r--r--drivers/s390/net/netiucv.c2
-rw-r--r--drivers/sbus/char/display7seg.c2
-rw-r--r--drivers/sbus/char/envctrl.c2
-rw-r--r--drivers/sbus/char/flash.c2
-rw-r--r--drivers/sbus/char/jsflash.c2
-rw-r--r--drivers/sbus/char/openprom.c2
-rw-r--r--drivers/scsi/3w-9xxx.c2
-rw-r--r--drivers/scsi/3w-sas.c2
-rw-r--r--drivers/scsi/3w-xxxx.c2
-rw-r--r--drivers/scsi/aacraid/aachba.c2
-rw-r--r--drivers/scsi/aacraid/commctrl.c2
-rw-r--r--drivers/scsi/arcmsr/arcmsr_hba.c2
-rw-r--r--drivers/scsi/bfa/bfad.c2
-rw-r--r--drivers/scsi/dpt_i2o.c2
-rw-r--r--drivers/scsi/gdth.c2
-rw-r--r--drivers/scsi/hptiop.c2
-rw-r--r--drivers/scsi/ips.h2
-rw-r--r--drivers/scsi/megaraid.c2
-rw-r--r--drivers/scsi/megaraid/megaraid_mm.h2
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_base.c2
-rw-r--r--drivers/scsi/osst.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_sup.c2
-rw-r--r--drivers/scsi/scsi_ioctl.c2
-rw-r--r--drivers/scsi/scsi_proc.c2
-rw-r--r--drivers/scsi/sd.c2
-rw-r--r--drivers/scsi/sr.c2
-rw-r--r--drivers/scsi/sr_ioctl.c2
-rw-r--r--drivers/scsi/st.c2
-rw-r--r--drivers/spi/spidev.c2
-rw-r--r--drivers/staging/bcm/headers.h2
-rw-r--r--drivers/staging/csr/drv.c2
-rw-r--r--drivers/staging/csr/firmware.c2
-rw-r--r--drivers/staging/csr/sme_wext.c2
-rw-r--r--drivers/staging/cxt1e1/hwprobe.c2
-rw-r--r--drivers/staging/cxt1e1/linux.c2
-rw-r--r--drivers/staging/cxt1e1/sbeproc.c2
-rw-r--r--drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c2
-rw-r--r--drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c2
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c2
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c2
-rw-r--r--drivers/staging/rtl8192u/ieee80211/ieee80211_module.c2
-rw-r--r--drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c2
-rw-r--r--drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c2
-rw-r--r--drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c2
-rw-r--r--drivers/staging/rtl8192u/r8192U_core.c2
-rw-r--r--drivers/staging/sb105x/sb_pci_mp.h2
-rw-r--r--drivers/staging/wlags49_h2/wl_main.c2
-rw-r--r--drivers/staging/wlags49_h2/wl_pci.c2
-rw-r--r--drivers/staging/wlags49_h2/wl_profile.c2
-rw-r--r--drivers/staging/wlags49_h2/wl_wext.c2
-rw-r--r--drivers/tty/amiserial.c2
-rw-r--r--drivers/tty/hvc/hvc_console.c2
-rw-r--r--drivers/tty/hvc/hvcs.c2
-rw-r--r--drivers/tty/hvc/hvsi.c2
-rw-r--r--drivers/tty/moxa.c2
-rw-r--r--drivers/tty/mxser.c2
-rw-r--r--drivers/tty/n_hdlc.c2
-rw-r--r--drivers/tty/n_r3964.c2
-rw-r--r--drivers/tty/serial/68328serial.c2
-rw-r--r--drivers/tty/serial/icom.c2
-rw-r--r--drivers/tty/serial/serial_core.c2
-rw-r--r--drivers/tty/synclink.c2
-rw-r--r--drivers/tty/synclink_gt.c2
-rw-r--r--drivers/tty/synclinkmp.c2
-rw-r--r--drivers/tty/tty_ioctl.c2
-rw-r--r--drivers/tty/vt/consolemap.c2
-rw-r--r--drivers/tty/vt/selection.c2
-rw-r--r--drivers/tty/vt/vc_screen.c2
-rw-r--r--drivers/tty/vt/vt_ioctl.c2
-rw-r--r--drivers/usb/atm/usbatm.c2
-rw-r--r--drivers/usb/core/devio.c2
-rw-r--r--drivers/usb/core/hub.c2
-rw-r--r--drivers/usb/gadget/android.c2
-rw-r--r--drivers/usb/gadget/inode.c2
-rw-r--r--drivers/usb/host/uhci-hcd.c2
-rw-r--r--drivers/usb/host/xhci.c4
-rw-r--r--drivers/usb/misc/adutux.c2
-rw-r--r--drivers/usb/misc/ftdi-elan.c2
-rw-r--r--drivers/usb/misc/idmouse.c2
-rw-r--r--drivers/usb/misc/ldusb.c2
-rw-r--r--drivers/usb/misc/legousbtower.c2
-rw-r--r--drivers/usb/mon/mon_bin.c2
-rw-r--r--drivers/usb/mon/mon_stat.c2
-rw-r--r--drivers/usb/mon/mon_text.c2
-rw-r--r--drivers/usb/musb/musb_debugfs.c2
-rw-r--r--drivers/video/68328fb.c2
-rw-r--r--drivers/video/console/newport_con.c2
-rw-r--r--drivers/video/hitfb.c2
-rw-r--r--drivers/video/hpfb.c2
-rw-r--r--drivers/video/mx3fb.c2
-rw-r--r--drivers/video/q40fb.c2
-rw-r--r--drivers/video/sm501fb.c2
-rw-r--r--drivers/video/stifb.c2
-rw-r--r--drivers/video/w100fb.c2
-rw-r--r--drivers/zorro/proc.c2
809 files changed, 826 insertions, 826 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 3add5a26a..cb8a5481d 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -40,7 +40,7 @@
#ifdef CONFIG_ACPI_PROCFS_POWER
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#endif
#include <acpi/acpi_bus.h>
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 8d1c0105e..773884826 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -27,7 +27,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/types.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/thermal.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 276ea4727..c9afabfd9 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -47,7 +47,7 @@
#include <linux/semaphore.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <acpi/acpi.h>
#include <acpi/acpi_bus.h>
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index 04a13784d..143256a80 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -3,7 +3,7 @@
#include <linux/export.h>
#include <linux/suspend.h>
#include <linux/bcd.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 3efb90bb0..280ecb27a 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -50,7 +50,7 @@
#include <asm/io.h>
#include <asm/cpu.h>
#include <asm/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/processor.h>
#include <asm/smp.h>
#include <asm/acpi.h>
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index e8e652710..566185413 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -31,7 +31,7 @@
#include <linux/init.h>
#include <linux/cpufreq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <acpi/acpi_bus.h>
#include <acpi/processor.h>
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 5e47d7bf4..fedb04203 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -34,7 +34,7 @@
#include <linux/cpufreq.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 056cf93fa..bf4e440c4 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -33,7 +33,7 @@
#ifdef CONFIG_ACPI_PROCFS_POWER
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#endif
#include <linux/acpi.h>
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index a33821ca3..5d4190013 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -41,7 +41,7 @@
#include <linux/kmod.h>
#include <linux/reboot.h>
#include <linux/device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/thermal.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index e3ecaf4d6..b5f8b09fc 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -37,7 +37,7 @@
#include <linux/pci.h>
#include <linux/pci_ids.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/dmi.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index f9b983ae6..1fd25e872 100644
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <asm/io.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/atmdev.h>
#include <linux/atm.h>
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index 0e3f8f9dc..ef915efe2 100644
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -10,7 +10,7 @@
#include <linux/bitops.h>
#include <linux/init.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/atomic.h>
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index b1955ba40..20d65e9df 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -21,7 +21,7 @@
#include <linux/slab.h>
#include <asm/io.h>
#include <linux/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/string.h>
#include <asm/byteorder.h>
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index b41c9481b..7e8f0d827 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -52,7 +52,7 @@
#include <asm/string.h>
#include <asm/io.h>
#include <linux/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/wait.h>
#include "firestream.h"
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 204814e88..ab8c4959d 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -43,7 +43,7 @@
#include <asm/irq.h>
#include <asm/dma.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/atomic.h>
#ifdef CONFIG_SBUS
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 507362a76..8b1534734 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -71,7 +71,7 @@
#include <linux/slab.h>
#include <asm/io.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/atmdev.h>
#include <linux/atm.h>
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 1dc051933..ca8ca60f7 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -45,7 +45,7 @@
#include <asm/io.h>
#include <linux/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/string.h>
#include <asm/byteorder.h>
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c
index 45d506363..ffec8f26a 100644
--- a/drivers/atm/idt77105.c
+++ b/drivers/atm/idt77105.c
@@ -17,7 +17,7 @@
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <asm/param.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "idt77105.h"
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index 1bdf104e9..7a5494e36 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -45,7 +45,7 @@
#include <linux/slab.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/atomic.h>
#include <asm/byteorder.h>
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 4217f29a8..87bc11f12 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -58,7 +58,7 @@
#include <linux/slab.h>
#include <asm/io.h>
#include <linux/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/string.h>
#include <asm/byteorder.h>
#include <linux/vmalloc.h>
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 6587dc295..5420c07b2 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -50,7 +50,7 @@
#include <linux/slab.h>
#include <linux/idr.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/atomic.h>
#include "nicstar.h"
#ifdef CONFIG_ATM_NICSTAR_USE_SUNI
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
index 021593455..b0363149b 100644
--- a/drivers/atm/suni.c
+++ b/drivers/atm/suni.c
@@ -23,7 +23,7 @@
#include <linux/atm_suni.h>
#include <linux/slab.h>
#include <asm/param.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/atomic.h>
#include "suni.h"
diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
index 5120a96b3..4fa13a807 100644
--- a/drivers/atm/uPD98402.c
+++ b/drivers/atm/uPD98402.c
@@ -10,7 +10,7 @@
#include <linux/sonet.h>
#include <linux/init.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/atomic.h>
#include "uPD98402.h"
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 969c3c290..e6092cd1b 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -27,7 +27,7 @@
#include <asm/string.h>
#include <asm/io.h>
#include <linux/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "uPD98401.h"
#include "uPD98402.h"
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index 4ca365fc7..19f8641dc 100644
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -875,7 +875,7 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages,
#include <linux/fs.h>
#include <linux/miscdevice.h>
#include <linux/dma-mapping.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/sh_svp.h>
#define SVP_STATE_NULL 0x00
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 86abbff91..f894ebf24 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -24,7 +24,7 @@
#include <linux/slab.h>
#include <linux/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static DEFINE_MUTEX(mem_sysfs_mutex);
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index eb3950113..d99b62cdc 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -48,7 +48,7 @@
#include <linux/random.h>
#include <linux/scatterlist.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "DAC960.h"
#define DAC960_GAM_MINOR 252
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 4ff85b878..9e90304cc 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -70,7 +70,7 @@
#include <linux/platform_device.h>
#include <asm/setup.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/amigahw.h>
#include <asm/amigaints.h>
#include <asm/irq.h>
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index d91f1a56e..c15efa3ee 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -20,7 +20,7 @@
#include <linux/fs.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define SECTOR_SHIFT 9
#define PAGE_SECTORS_SHIFT (PAGE_SHIFT - SECTOR_SHIFT)
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 90a4e6b94..af368fc25 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -43,7 +43,7 @@
#include <linux/mutex.h>
#include <linux/bitmap.h>
#include <linux/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/dma-mapping.h>
#include <linux/blkdev.h>
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 2b9440384..c2e4f9b08 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -40,7 +40,7 @@
#include <linux/blkdev.h>
#include <linux/genhd.h>
#include <linux/scatterlist.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
diff --git a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c
index 8b6bb764b..7205c83c8 100644
--- a/drivers/block/cryptoloop.c
+++ b/drivers/block/cryptoloop.c
@@ -27,7 +27,7 @@
#include <linux/blkdev.h>
#include <linux/loop.h>
#include <linux/scatterlist.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("loop blockdevice transferfunction adaptor / CryptoAPI");
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 776fc08af..8e47ed3db 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -28,7 +28,7 @@
#include <linux/module.h>
#include <linux/drbd.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/types.h>
#include <net/sock.h>
#include <linux/ctype.h>
diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c
index bf31d41db..9d188402b 100644
--- a/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
@@ -25,7 +25,7 @@
#include <linux/module.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/fs.h>
#include <linux/file.h>
#include <linux/proc_fs.h>
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 4222affff..a1cc7e76d 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -25,7 +25,7 @@
#include <linux/module.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <net/sock.h>
#include <linux/drbd.h>
diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index bf397bf10..6601a0ccd 100644
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -45,7 +45,7 @@
#define REALLY_SLOW_IO
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef __arm__
#undef HD_IRQ
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 333458ca1..4240f9334 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -77,7 +77,7 @@
#include <linux/miscdevice.h>
#include <linux/falloc.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static DEFINE_IDR(loop_index_idr);
static DEFINE_MUTEX(loop_index_mutex);
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index be7328661..d22e513e7 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -33,7 +33,7 @@
#include <linux/net.h>
#include <linux/kthread.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/types.h>
#include <linux/nbd.h>
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index e76bdc074..2be4cb27f 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -139,7 +139,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};
#include <linux/spinlock.h>
#include <linux/blkdev.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static DEFINE_MUTEX(pcd_mutex);
static DEFINE_SPINLOCK(pcd_lock);
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 897b6b9e5..b7b25f92b 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -155,7 +155,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO, D_SBY, D_DLY, D_SLV};
#include <linux/blkpg.h>
#include <linux/kernel.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/workqueue.h>
static DEFINE_MUTEX(pd_mutex);
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index f5c86d523..92fe0a9a0 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -155,7 +155,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_LUN, D_DLY};
#include <linux/blkdev.h>
#include <linux/blkpg.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static DEFINE_MUTEX(pf_mutex);
static DEFINE_SPINLOCK(pf_spin_lock);
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 4a27b1de5..b9e00ad0e 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -166,7 +166,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};
#include <linux/mutex.h>
#include <linux/jiffies.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
module_param(verbose, bool, 0644);
module_param(major, int, 0);
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index ada45058e..26bc89ca5 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -150,7 +150,7 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3};
#include <linux/sched.h> /* current, TASK_*, schedule_timeout() */
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
module_param(verbose, int, 0);
module_param(major, int, 0);
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index caddb5dba..8c9efcbcd 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -65,7 +65,7 @@
#include <linux/debugfs.h>
#include <linux/device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define DRIVER_NAME "pktcdvd"
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 20e061c3e..cd649c147 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -33,7 +33,7 @@
#include <asm/io.h>
#include <asm/dbdma.h>
#include <asm/prom.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/mediabay.h>
#include <asm/machdep.h>
#include <asm/pmac_feature.h>
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 3fb6ab4c8..343c280b1 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -29,7 +29,7 @@
#include <linux/completion.h>
#include <linux/scatterlist.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#if 0
#define CARM_DEBUG
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index ad70868f8..cd8cf7fd4 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -54,7 +54,7 @@
#include "umem.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#define MM_MAXCARDS 4
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 1ca0772c7..99d4662d5 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -282,7 +282,7 @@
#include <linux/blkdev.h>
#include <linux/times.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* used to tell the module to turn on full debugging messages */
static bool debug;
diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
index a48e05b31..2053f70ef 100644
--- a/drivers/char/agp/compat_ioctl.c
+++ b/drivers/char/agp/compat_ioctl.c
@@ -31,7 +31,7 @@
#include <linux/fs.h>
#include <linux/agpgart.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "agp.h"
#include "compat_ioctl.h"
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 2e0443387..5178bec23 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -39,7 +39,7 @@
#include <linux/mm.h>
#include <linux/fs.h>
#include <linux/sched.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/pgtable.h>
#include "agp.h"
diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index 14790304b..e5c62dcf2 100644
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -34,7 +34,7 @@
#include <linux/fs.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "applicom.h"
diff --git a/drivers/char/bfin-otp.c b/drivers/char/bfin-otp.c
index 44660f1c4..132d201d3 100644
--- a/drivers/char/bfin-otp.c
+++ b/drivers/char/bfin-otp.c
@@ -20,7 +20,7 @@
#include <asm/blackfin.h>
#include <asm/bfrom.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define stamp(fmt, args...) pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args)
#define stampit() stamp("here i am")
diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c
index 0fae5296e..eb53cbadb 100644
--- a/drivers/char/ds1620.c
+++ b/drivers/char/ds1620.c
@@ -13,7 +13,7 @@
#include <mach/hardware.h>
#include <asm/mach-types.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/therm.h>
#ifdef CONFIG_PROC_FS
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index 65a8d96c0..58471394b 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -59,7 +59,7 @@
#include <linux/sched.h>
#include <linux/mutex.h>
#include <asm/io.h> /* for inb_p, outb_p, inb, outb, etc. */
-#include <asm/uaccess.h> /* for get_user, etc. */
+#include <linux/uaccess.h> /* for get_user, etc. */
#include <linux/wait.h> /* for wait_queue */
#include <linux/init.h> /* for __init, module_{init,exit} */
#include <linux/poll.h> /* for POLLIN, etc. */
diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c
index 6c4f4b5a9..098479b33 100644
--- a/drivers/char/generic_nvram.c
+++ b/drivers/char/generic_nvram.c
@@ -20,7 +20,7 @@
#include <linux/fcntl.h>
#include <linux/init.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/nvram.h>
#ifdef CONFIG_PPC_PMAC
#include <asm/machdep.h>
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
index 4f943759d..e5f9c184a 100644
--- a/drivers/char/genrtc.c
+++ b/drivers/char/genrtc.c
@@ -56,7 +56,7 @@
#include <linux/mutex.h>
#include <linux/workqueue.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/rtc.h>
/*
diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c
index f953c96ef..cc96b5629 100644
--- a/drivers/char/hangcheck-timer.c
+++ b/drivers/char/hangcheck-timer.c
@@ -46,7 +46,7 @@
#include <linux/reboot.h>
#include <linux/init.h>
#include <linux/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/sysrq.h>
#include <linux/timer.h>
#include <linux/time.h>
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index a0f772485..803f71aef 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -41,7 +41,7 @@
#include <linux/miscdevice.h>
#include <linux/delay.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define RNG_MODULE_NAME "hw_random"
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index e6939e13e..4af30db06 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -29,7 +29,7 @@
#include <linux/mutex.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <linux/i8k.h>
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 37b8be7cb..021dd6509 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -43,7 +43,7 @@
#include <linux/kdebug.h>
#include <linux/rwsem.h>
#include <linux/errno.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/notifier.h>
#include <linux/nmi.h>
#include <linux/reboot.h>
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 6b619105d..01e48b979 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -134,7 +134,7 @@
#include <linux/lp.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* if you have more than 8 printers, remember to increase LP_NO */
#define LP_NO 8
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index e5d3e3f7a..07e865e6b 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -27,7 +27,7 @@
#include <linux/mutex.h>
#include <linux/slab.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/pgtable.h>
#include <asm/sn/addrs.h>
#include <asm/sn/intr.h>
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 1a62849e7..8da24e019 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -30,7 +30,7 @@
#include <linux/io.h>
#include <linux/aio.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef CONFIG_IA64
# include <linux/efi.h>
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index 3d6c0671e..f786b18ac 100644
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -35,7 +35,7 @@
#include <linux/mutex.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/sn/addrs.h>
#include <asm/sn/intr.h>
#include <asm/sn/shub_mmr.h>
diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c
index 881c9e595..07472b327 100644
--- a/drivers/char/mwave/3780i.c
+++ b/drivers/char/mwave/3780i.c
@@ -55,7 +55,7 @@
#include <linux/sched.h> /* cond_resched() */
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/irq.h>
#include "smapi.h"
#include "mwavedd.h"
diff --git a/drivers/char/mwave/mwavedd.h b/drivers/char/mwave/mwavedd.h
index 7e0d530e2..ecce012c1 100644
--- a/drivers/char/mwave/mwavedd.h
+++ b/drivers/char/mwave/mwavedd.h
@@ -53,7 +53,7 @@
#include "smapi.h"
#include "mwavepub.h"
#include <linux/ioctl.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/wait.h>
extern int mwave_debug;
diff --git a/drivers/char/nsc_gpio.c b/drivers/char/nsc_gpio.c
index b07b119ae..2a91bf048 100644
--- a/drivers/char/nsc_gpio.c
+++ b/drivers/char/nsc_gpio.c
@@ -14,7 +14,7 @@
#include <linux/init.h>
#include <linux/nsc_gpio.h>
#include <linux/platform_device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#define NAME "nsc_gpio"
diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c
index cfdfe493c..b861d4f10 100644
--- a/drivers/char/nwbutton.c
+++ b/drivers/char/nwbutton.c
@@ -16,7 +16,7 @@
#include <linux/errno.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/irq.h>
#include <asm/mach-types.h>
diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c
index e371480d3..9b3a4b61e 100644
--- a/drivers/char/nwflash.c
+++ b/drivers/char/nwflash.c
@@ -31,7 +31,7 @@
#include <asm/hardware/dec21285.h>
#include <asm/io.h>
#include <asm/mach-types.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/*****************************************************************************/
#include <asm/nwflash.h>
diff --git a/drivers/char/pc8736x_gpio.c b/drivers/char/pc8736x_gpio.c
index 3f79a9fb6..5f4be88c0 100644
--- a/drivers/char/pc8736x_gpio.c
+++ b/drivers/char/pc8736x_gpio.c
@@ -20,7 +20,7 @@
#include <linux/mutex.h>
#include <linux/nsc_gpio.h>
#include <linux/platform_device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define DEVNAME "pc8736x_gpio"
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 8dd48a2be..baa8bd8c4 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -26,7 +26,7 @@
#include <linux/poll.h>
#include <linux/mutex.h>
#include <linux/wait.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <pcmcia/cistpl.h>
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 5c5cc00eb..10d958d71 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -84,7 +84,7 @@
#define PUT_USER(error,value,addr) error = put_user(value,addr)
#define COPY_TO_USER(error,dest,src,size) error = copy_to_user(dest,src,size) ? -EFAULT : 0
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static MGSL_PARAMS default_params = {
MGSL_MODE_HDLC, /* unsigned long mode */
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 9064bf0d0..fd09deec2 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -266,7 +266,7 @@
#include <linux/completion.h>
#include <asm/processor.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/irq.h>
#include <asm/irq_regs.h>
#include <asm/io.h>
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 6e8d65e9b..005e9bd6d 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -23,7 +23,7 @@
#include <linux/compat.h>
#include <linux/vmalloc.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
struct raw_device_data {
struct block_device *binding;
diff --git a/drivers/char/scx200_gpio.c b/drivers/char/scx200_gpio.c
index 0bc135b9b..903761bc4 100644
--- a/drivers/char/scx200_gpio.c
+++ b/drivers/char/scx200_gpio.c
@@ -12,7 +12,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <linux/types.h>
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index bf2349dbb..d36e4a8f8 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -52,7 +52,7 @@
#include <linux/platform_device.h>
#include <linux/gfp.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <linux/sonypi.h>
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index e95e0ab0b..21f9a2cb9 100644
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -44,7 +44,7 @@
#include <linux/miscdevice.h>
#include <linux/platform_device.h>
#include <asm/io.h> /* inb/outb */
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
MODULE_AUTHOR("Sebastien Bouchard <sebastien.bouchard@ca.kontron.com>");
MODULE_LICENSE("GPL");
diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c
index 014c9d90d..8e1e61e84 100644
--- a/drivers/char/toshiba.c
+++ b/drivers/char/toshiba.c
@@ -63,7 +63,7 @@
#include <linux/miscdevice.h>
#include <linux/ioport.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/init.h>
#include <linux/stat.h>
#include <linux/proc_fs.h>
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 5224da520..cb66569c1 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -88,7 +88,7 @@
#include <linux/slab.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef CONFIG_OF
/* For open firmware. */
diff --git a/drivers/cpufreq/ia64-acpi-cpufreq.c b/drivers/cpufreq/ia64-acpi-cpufreq.c
index c0075dbaa..82279e482 100644
--- a/drivers/cpufreq/ia64-acpi-cpufreq.c
+++ b/drivers/cpufreq/ia64-acpi-cpufreq.c
@@ -16,7 +16,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/pal.h>
#include <linux/acpi.h>
diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c
index 9b784051e..1ad6ac762 100644
--- a/drivers/cpuidle/governors/ladder.c
+++ b/drivers/cpuidle/governors/ladder.c
@@ -19,7 +19,7 @@
#include <linux/jiffies.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define PROMOTION_COUNT 4
#define DEMOTION_COUNT 1
diff --git a/drivers/cpuidle/mtk_cpuidle_internal.c b/drivers/cpuidle/mtk_cpuidle_internal.c
index 90a70233e..d2363e93c 100644
--- a/drivers/cpuidle/mtk_cpuidle_internal.c
+++ b/drivers/cpuidle/mtk_cpuidle_internal.c
@@ -1,4 +1,4 @@
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/cpu.h>
#include <linux/debugfs.h>
#include <linux/seq_file.h>
diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c
index 55dd88d82..830184529 100644
--- a/drivers/dio/dio.c
+++ b/drivers/dio/dio.c
@@ -31,7 +31,7 @@
#include <linux/init.h>
#include <linux/dio.h>
#include <linux/slab.h> /* kmalloc() */
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h> /* readb() */
struct dio_bus dio_bus = {
diff --git a/drivers/dma/iovlock.c b/drivers/dma/iovlock.c
index bb48a57c2..d320a4e13 100644
--- a/drivers/dma/iovlock.c
+++ b/drivers/dma/iovlock.c
@@ -30,7 +30,7 @@
#include <linux/slab.h>
#include <net/tcp.h> /* for memcpy_toiovec */
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static int num_pages_spanned(struct iovec *iov)
{
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index 211021dfe..2b7b141b7 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -25,7 +25,7 @@
#include <linux/list.h>
#include <linux/ctype.h>
#include <linux/workqueue.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/page.h>
#include "edac_core.h"
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 9e15fc8df..4298eb83a 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -28,7 +28,7 @@
#include <linux/ctype.h>
#include <linux/edac.h>
#include <linux/bitops.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/page.h>
#include <asm/edac.h>
#include "edac_core.h"
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
index dd370f92a..84b1ed82a 100644
--- a/drivers/edac/edac_pci.c
+++ b/drivers/edac/edac_pci.c
@@ -21,7 +21,7 @@
#include <linux/list.h>
#include <linux/ctype.h>
#include <linux/workqueue.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/page.h>
#include "edac_core.h"
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 5de00c496..ae5eb983c 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -42,7 +42,7 @@
#include <linux/rwsem.h>
#include <linux/pm_runtime.h>
#include <linux/acpi.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "i2c-core.h"
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
index 696b6c1ec..0f3ec077d 100644
--- a/drivers/ide/hpt366.c
+++ b/drivers/ide/hpt366.c
@@ -130,7 +130,7 @@
#include <linux/ide.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#define DRV_NAME "hpt366"
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 121071f9d..2b77f1699 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -31,7 +31,7 @@
#include <asm/byteorder.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/div64.h>
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 177db6d5b..e13bd7fa0 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -51,7 +51,7 @@
#include <asm/byteorder.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
int ide_end_rq(ide_drive_t *drive, struct request *rq, int error,
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 376f2dc41..210a0887d 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -24,7 +24,7 @@
#include <asm/byteorder.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
void SELECT_MASK(ide_drive_t *drive, int mask)
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 068cef0a9..9b7b72578 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -36,7 +36,7 @@
#include <asm/byteorder.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
/**
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index 97c070077..863db44c7 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -16,7 +16,7 @@
#include <linux/module.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/errno.h>
#include <linux/proc_fs.h>
#include <linux/stat.h>
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index 5befec118..ed039eb9a 100644
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -46,7 +46,7 @@
#include <linux/mutex.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <rdma/ib.h>
#include <rdma/ib_cm.h>
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 1acb99100..691907c03 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -48,7 +48,7 @@
#include <linux/semaphore.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <rdma/ib_mad.h>
#include <rdma/ib_user_mad.h>
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 44c15cebd..9ff9d4772 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -37,7 +37,7 @@
#include <linux/fs.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "uverbs.h"
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 37b720794..3394601f5 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -46,7 +46,7 @@
#include <linux/anon_inodes.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <rdma/ib.h>
diff --git a/drivers/infiniband/hw/ipath/ipath_diag.c b/drivers/infiniband/hw/ipath/ipath_diag.c
index 45802e973..a28cc1954 100644
--- a/drivers/infiniband/hw/ipath/ipath_diag.c
+++ b/drivers/infiniband/hw/ipath/ipath_diag.c
@@ -46,7 +46,7 @@
#include <linux/vmalloc.h>
#include <linux/fs.h>
#include <linux/export.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "ipath_kernel.h"
#include "ipath_common.h"
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 7604ae54d..a06372acb 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -35,7 +35,7 @@
#include <linux/init.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "ipoib.h"
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 2e84ef859..c8b46603d 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -62,7 +62,7 @@
#include <net/sock.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
diff --git a/drivers/input/input-compat.c b/drivers/input/input-compat.c
index 64ca7113f..4cc735b14 100644
--- a/drivers/input/input-compat.c
+++ b/drivers/input/input-compat.c
@@ -9,7 +9,7 @@
*/
#include <linux/export.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "input-compat.h"
#ifdef CONFIG_COMPAT
diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c
index 5d4402365..2c04a966b 100644
--- a/drivers/input/misc/atlas_btns.c
+++ b/drivers/input/misc/atlas_btns.c
@@ -28,7 +28,7 @@
#include <linux/init.h>
#include <linux/input.h>
#include <linux/types.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <acpi/acpi_drivers.h>
#define ACPI_ATLAS_NAME "Atlas ACPI"
diff --git a/drivers/input/mouse/amimouse.c b/drivers/input/mouse/amimouse.c
index b55d5af21..c327187d0 100644
--- a/drivers/input/mouse/amimouse.c
+++ b/drivers/input/mouse/amimouse.c
@@ -25,7 +25,7 @@
#include <asm/irq.h>
#include <asm/setup.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/amigahw.h>
#include <asm/amigaints.h>
diff --git a/drivers/input/mouse/atarimouse.c b/drivers/input/mouse/atarimouse.c
index d1c43236b..96f2f5160 100644
--- a/drivers/input/mouse/atarimouse.c
+++ b/drivers/input/mouse/atarimouse.c
@@ -47,7 +47,7 @@
#include <asm/irq.h>
#include <asm/setup.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atarihw.h>
#include <asm/atarikb.h>
#include <asm/atariints.h>
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
index ca843b6cf..d092016c4 100644
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -15,7 +15,7 @@
#include <linux/input.h>
#include <linux/libps2.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "psmouse.h"
#include "trackpoint.h"
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index d7a7e54f6..4558b86a7 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -79,7 +79,7 @@
# define sdc_readb(p) gsc_readb(p)
# define sdc_writeb(v,p) gsc_writeb((v),(p))
#elif defined(__mc68000__)
-# include <asm/uaccess.h>
+#include <linux/uaccess.h>
# define sdc_readb(p) in_8(p)
# define sdc_writeb(v,p) out_8((p),(v))
#else
diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c
index 436a3433f..a4e2e124d 100644
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
@@ -39,7 +39,7 @@
#include <linux/slab.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/q40_master.h>
#include <asm/irq.h>
#include <asm/q40ints.h>
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index e4ecf3b64..61769aa5b 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -13,7 +13,7 @@
* the Free Software Foundation.
*/
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/slab.h>
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index ee83c3904..6bb888102 100644
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -76,7 +76,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/usb/input.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/unaligned.h>
/*
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c
index 5a7be4c55..ccceda74c 100644
--- a/drivers/input/tablet/gtco.c
+++ b/drivers/input/tablet/gtco.c
@@ -57,7 +57,7 @@ Scott Hill shill@gtcocalcomp.com
#include <linux/slab.h>
#include <linux/input.h>
#include <linux/usb.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/unaligned.h>
#include <asm/byteorder.h>
diff --git a/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c b/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c
index 4cb3c24e0..f0e9958c5 100644
--- a/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c
+++ b/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c
@@ -40,7 +40,7 @@
#include <linux/completion.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <cust_eint.h>
#include <asm/unaligned.h>
#include <mach/eint.h>
diff --git a/drivers/input/touchscreen/mediatek/GT1151/gt1x_extents.c b/drivers/input/touchscreen/mediatek/GT1151/gt1x_extents.c
index dfd893d96..6cf316e87 100644
--- a/drivers/input/touchscreen/mediatek/GT1151/gt1x_extents.c
+++ b/drivers/input/touchscreen/mediatek/GT1151/gt1x_extents.c
@@ -32,7 +32,7 @@
#ifdef CONFIG_COMPAT
#include <linux/compat.h>
#endif
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/proc_fs.h> /*proc */
#include <asm/ioctl.h>
diff --git a/drivers/input/touchscreen/mediatek/GT1151/gt1x_tools.c b/drivers/input/touchscreen/mediatek/GT1151/gt1x_tools.c
index 80368d2f8..c4060c9f0 100644
--- a/drivers/input/touchscreen/mediatek/GT1151/gt1x_tools.c
+++ b/drivers/input/touchscreen/mediatek/GT1151/gt1x_tools.c
@@ -20,7 +20,7 @@
*/
#include <linux/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/proc_fs.h>
#include "gt1x_generic.h"
diff --git a/drivers/input/touchscreen/mediatek/GT1151/gt1x_update.c b/drivers/input/touchscreen/mediatek/GT1151/gt1x_update.c
index 3ba359460..9f0f32201 100644
--- a/drivers/input/touchscreen/mediatek/GT1151/gt1x_update.c
+++ b/drivers/input/touchscreen/mediatek/GT1151/gt1x_update.c
@@ -26,7 +26,7 @@
#include <linux/delay.h>
#include <linux/namei.h>
#include <linux/mount.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "gt1x_generic.h"
#if (GTP_HOTKNOT || GTP_HEADER_FW_UPDATE)
diff --git a/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c b/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c
index 55623fa57..12c5d760b 100644
--- a/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c
@@ -19,7 +19,7 @@
#include <linux/rtpm_prio.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "tpd_custom_GT813.h"
diff --git a/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c b/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c
index 86c34d00b..4ac583bde 100644
--- a/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c
@@ -21,7 +21,7 @@
#include <linux/rtpm_prio.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "tpd_custom_GT818B.h"
#include <mach/mt_pm_ldo.h>
@@ -173,7 +173,7 @@ static struct proc_dir_entry *gt818_config_proc = NULL;
#ifdef VELOCITY_CUSTOM_GT818B
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifndef TPD_VELOCITY_CUSTOM_X
#define TPD_VELOCITY_CUSTOM_X 10
diff --git a/drivers/input/touchscreen/mediatek/GT818B/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT818B/goodix_tool.c
index 1a3e92fc4..5eed8009f 100644
--- a/drivers/input/touchscreen/mediatek/GT818B/goodix_tool.c
+++ b/drivers/input/touchscreen/mediatek/GT818B/goodix_tool.c
@@ -14,7 +14,7 @@
#include <linux/i2c.h>
#include <linux/proc_fs.h>
#include <linux/string.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define IC_TYPE_NAME "GT818"
#define DATA_LENGTH_UINT 512
diff --git a/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c b/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c
index 1ba26e3f6..730f8d829 100644
--- a/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c
@@ -19,7 +19,7 @@
#include <linux/rtpm_prio.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
@@ -170,7 +170,7 @@ static struct proc_dir_entry *gt818_config_proc = NULL;
#ifdef VELOCITY_CUSTOM_GT818B
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifndef TPD_VELOCITY_CUSTOM_X
#define TPD_VELOCITY_CUSTOM_X 10
diff --git a/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c b/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c
index 0060bd2bf..3aa78bceb 100644
--- a/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c
@@ -25,7 +25,7 @@
#include <linux/fs.h>
#include <linux/string.h>
#include <linux/completion.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_pm_ldo.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/input/touchscreen/mediatek/GT910/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT910/goodix_tool.c
index 8a268a800..f2ed97973 100644
--- a/drivers/input/touchscreen/mediatek/GT910/goodix_tool.c
+++ b/drivers/input/touchscreen/mediatek/GT910/goodix_tool.c
@@ -30,7 +30,7 @@
#include <linux/time.h>
#include <linux/delay.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT910/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT910/gt9xx_update.c
index 87f2098ed..3aa31033f 100644
--- a/drivers/input/touchscreen/mediatek/GT910/gt9xx_update.c
+++ b/drivers/input/touchscreen/mediatek/GT910/gt9xx_update.c
@@ -40,7 +40,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT911/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT911/goodix_tool.c
index 55ff8656c..4d2e081d2 100644
--- a/drivers/input/touchscreen/mediatek/GT911/goodix_tool.c
+++ b/drivers/input/touchscreen/mediatek/GT911/goodix_tool.c
@@ -30,7 +30,7 @@
#include <linux/time.h>
#include <linux/delay.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT911/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT911/gt9xx_update.c
index f4fd83f68..c3399d413 100644
--- a/drivers/input/touchscreen/mediatek/GT911/gt9xx_update.c
+++ b/drivers/input/touchscreen/mediatek/GT911/gt9xx_update.c
@@ -30,7 +30,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define GUP_FW_INFO
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX/goodix_tool.c
index db9406bd1..af710d90b 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX/goodix_tool.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX/goodix_tool.c
@@ -30,7 +30,7 @@
#include <linux/time.h>
#include <linux/delay.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX/gt9xx_update.c
index cf49f909c..209189654 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX/gt9xx_update.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX/gt9xx_update.c
@@ -30,7 +30,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define GUP_FW_INFO
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_2/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_2/goodix_tool.c
index d1faccce4..dc803aedc 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_2/goodix_tool.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_2/goodix_tool.c
@@ -30,7 +30,7 @@
#include <linux/time.h>
#include <linux/delay.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c
index ea731d451..623226c4b 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c
@@ -256,7 +256,7 @@ static struct proc_dir_entry *gt91xx_config_proc = NULL;
#ifdef VELOCITY_CUSTOM
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifndef TPD_VELOCITY_CUSTOM_X
#define TPD_VELOCITY_CUSTOM_X 10
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_update.c
index 650b53f72..fcf511802 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_update.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_update.c
@@ -46,7 +46,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_aio/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_aio/goodix_tool.c
index d04192ac7..944faaca8 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_aio/goodix_tool.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_aio/goodix_tool.c
@@ -32,7 +32,7 @@
#include "cust_gpio_usage.h"
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/proc_fs.h> /*proc*/
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_update.c
index d7a79471a..61d352a4f 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_update.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_update.c
@@ -46,7 +46,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define GUP_FW_INFO
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot/goodix_tool.c
index d04192ac7..944faaca8 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot/goodix_tool.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot/goodix_tool.c
@@ -32,7 +32,7 @@
#include "cust_gpio_usage.h"
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/proc_fs.h> /*proc*/
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_update.c
index 3e5eda70d..47d986c60 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_update.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_update.c
@@ -46,7 +46,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define GUP_FW_INFO
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/goodix_tool.c
index c6f819a92..dd77dab9a 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/goodix_tool.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/goodix_tool.c
@@ -32,7 +32,7 @@
#include "cust_gpio_usage.h"
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/proc_fs.h> /*proc*/
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_update.c
index babee2638..7fce07f93 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_update.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_update.c
@@ -46,7 +46,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define GUP_FW_INFO
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/goodix_tool.c
index d04192ac7..944faaca8 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/goodix_tool.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/goodix_tool.c
@@ -32,7 +32,7 @@
#include "cust_gpio_usage.h"
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/proc_fs.h> /*proc*/
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_update.c
index 17dcad5bb..d84e14d66 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_update.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_update.c
@@ -46,7 +46,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define GUP_FW_INFO
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/goodix_tool.c
index 050e55d23..5aad7ee4a 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/goodix_tool.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/goodix_tool.c
@@ -32,7 +32,7 @@
#include "cust_gpio_usage.h"
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/proc_fs.h> /*proc*/
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_update.c
index 4d005365b..dc6cd3e2a 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_update.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_update.c
@@ -46,7 +46,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define GUP_FW_INFO
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/goodix_tool.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/goodix_tool.c
index d04192ac7..944faaca8 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/goodix_tool.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/goodix_tool.c
@@ -32,7 +32,7 @@
#include "cust_gpio_usage.h"
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/proc_fs.h> /*proc*/
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_update.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_update.c
index 09a3ef4c6..a73402877 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_update.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_update.c
@@ -46,7 +46,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define GUP_FW_INFO
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ctl.c b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ctl.c
index 20c2add33..c708b607c 100644
--- a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ctl.c
+++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ctl.c
@@ -6,7 +6,7 @@
#include <linux/kernel.h>
#include <linux/semaphore.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/init.h>
diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c
index 7e6808ceb..44534623f 100644
--- a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c
+++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c
@@ -196,7 +196,7 @@ static int tpd_def_calmat_local[8] = TPD_CALIBRATION_MATRIX;
#ifdef VELOCITY_CUSTOM_FT5206
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
// for magnify velocity********************************************
diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.h b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.h
index 44fbadc46..6cdcc7ddc 100644
--- a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.h
+++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_ex_fun.h
@@ -12,7 +12,7 @@
#include <linux/syscalls.h>
#include <asm/unistd.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/fs.h>
#include <linux/string.h>
diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/tpd_custom_fts.h b/drivers/input/touchscreen/mediatek/MZ_FT5346/tpd_custom_fts.h
index 82f225470..2cbfae913 100644
--- a/drivers/input/touchscreen/mediatek/MZ_FT5346/tpd_custom_fts.h
+++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/tpd_custom_fts.h
@@ -27,7 +27,7 @@
#include <linux/rtpm_prio.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_pm_ldo.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/input/touchscreen/mediatek/MZ_GT9XX/goodix_tool.c b/drivers/input/touchscreen/mediatek/MZ_GT9XX/goodix_tool.c
index 9cee78f86..7f215491e 100644
--- a/drivers/input/touchscreen/mediatek/MZ_GT9XX/goodix_tool.c
+++ b/drivers/input/touchscreen/mediatek/MZ_GT9XX/goodix_tool.c
@@ -31,7 +31,7 @@
#include <linux/time.h>
#include <linux/delay.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c
index 57a5d8ef9..2cc8b949b 100644
--- a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c
+++ b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c
@@ -285,7 +285,7 @@ static const struct file_operations config_proc_ops = {
#ifdef VELOCITY_CUSTOM
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifndef TPD_VELOCITY_CUSTOM_X
#define TPD_VELOCITY_CUSTOM_X 10
diff --git a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_update.c b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_update.c
index 626a8d881..59591f82f 100644
--- a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_update.c
+++ b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_update.c
@@ -50,7 +50,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include "cust_gpio_usage.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "tpd_custom_gt9xx.h"
diff --git a/drivers/input/touchscreen/mediatek/MZ_GT9XX/tpd_custom_gt9xx.h b/drivers/input/touchscreen/mediatek/MZ_GT9XX/tpd_custom_gt9xx.h
index 63f3da5f2..36c9f750c 100644
--- a/drivers/input/touchscreen/mediatek/MZ_GT9XX/tpd_custom_gt9xx.h
+++ b/drivers/input/touchscreen/mediatek/MZ_GT9XX/tpd_custom_gt9xx.h
@@ -62,7 +62,7 @@
#include <linux/rtpm_prio.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef MT6575
#include <mach/mt6575_pm_ldo.h>
#include <mach/mt6575_typedefs.h>
diff --git a/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c b/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c
index da6b9a07f..46f77987a 100644
--- a/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c
+++ b/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c
@@ -27,7 +27,7 @@
#ifdef TPD_UPDATE_FIRMWARE
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/namei.h>
#include <linux/vmalloc.h>
diff --git a/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c b/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c
index c08438e1f..daaa7e5f4 100644
--- a/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c
+++ b/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c
@@ -104,7 +104,7 @@ static int tpd_def_calmat_local[8] = TPD_CALIBRATION_MATRIX;
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
struct touch_info {
int y[10];
diff --git a/drivers/input/touchscreen/mediatek/ft5206/focaltech_ex_fun.h b/drivers/input/touchscreen/mediatek/ft5206/focaltech_ex_fun.h
index bf48b0e58..b490961a2 100644
--- a/drivers/input/touchscreen/mediatek/ft5206/focaltech_ex_fun.h
+++ b/drivers/input/touchscreen/mediatek/ft5206/focaltech_ex_fun.h
@@ -12,7 +12,7 @@
#include <linux/syscalls.h>
#include <asm/unistd.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/fs.h>
#include <linux/string.h>
diff --git a/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c b/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c
index c48b6dadf..d70ccb829 100644
--- a/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c
+++ b/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c
@@ -105,7 +105,7 @@ static int tpd_def_calmat_local[8] = TPD_CALIBRATION_MATRIX;
#ifdef VELOCITY_CUSTOM_FT5206
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
// for magnify velocity********************************************
diff --git a/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c b/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c
index 008d9f689..deccc3376 100644
--- a/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c
+++ b/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c
@@ -19,7 +19,7 @@
#include <linux/rtpm_prio.h>
#include <mach/eint.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <cust_eint.h>
#include <linux/jiffies.h>
diff --git a/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c b/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c
index 39d1d680e..d29e6afe7 100644
--- a/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c
+++ b/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c
@@ -16,7 +16,7 @@
#include <linux/completion.h>
#include <linux/init.h>
#include <linux/dma-mapping.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/unaligned.h>
//#include <mach/mt_gpio.h>
#include "tpd.h"
diff --git a/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c b/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c
index a97de60fc..4fc404b0b 100644
--- a/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c
+++ b/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c
@@ -20,7 +20,7 @@
#include <linux/rtpm_prio.h>
#include <mach/eint.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <cust_eint.h>
#include <linux/jiffies.h>
diff --git a/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c b/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c
index e16e826ce..673837bab 100644
--- a/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c
+++ b/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c
@@ -22,7 +22,7 @@
#include <linux/rtpm_prio.h>
#include <mach/eint.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <cust_eint.h>
#include <linux/jiffies.h>
diff --git a/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c b/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c
index ec9e02f84..8506baef4 100644
--- a/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c
+++ b/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c
@@ -41,7 +41,7 @@
#include <linux/completion.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <cust_eint.h>
#include <asm/unaligned.h>
#include <mach/eint.h>
diff --git a/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c b/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c
index 62e034af5..21083e1ea 100644
--- a/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c
+++ b/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c
@@ -22,7 +22,7 @@
#include <linux/dma-mapping.h>
#include <linux/mm_types.h>
#include <linux/mm.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/page.h>
#include <linux/vmalloc.h>
diff --git a/drivers/input/touchscreen/mediatek/mtk_tpd.c b/drivers/input/touchscreen/mediatek/mtk_tpd.c
index 0917d7842..d4a45c88b 100644
--- a/drivers/input/touchscreen/mediatek/mtk_tpd.c
+++ b/drivers/input/touchscreen/mediatek/mtk_tpd.c
@@ -26,7 +26,7 @@
#include <linux/miscdevice.h>
#include <linux/device.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef CONFIG_COMPAT
#include <linux/compat.h>
diff --git a/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.c b/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.c
index e0b8f4cd5..38d27e1c0 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.c
@@ -48,7 +48,7 @@
#include <mach/mt_typedefs.h>
#include <mach/mt_boot.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <cust_eint.h>
#include "tpd.h"
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.c b/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.c
index a753e235c..4ea6d9792 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.c
@@ -50,7 +50,7 @@
#include <mach/mt_typedefs.h>
#include <mach/mt_boot.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <cust_eint.h>
#include "tpd.h"
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.c b/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.c
index 63ae54df9..72cb3a25f 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.c
@@ -50,7 +50,7 @@
#include <mach/mt_typedefs.h>
#include <mach/mt_boot.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <cust_eint.h>
#include "tpd.h"
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.c b/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.c
index c4d06701d..c27292392 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.c
@@ -50,7 +50,7 @@
#include <mach/mt_typedefs.h>
#include <mach/mt_boot.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <cust_eint.h>
#include "tpd.h"
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.c b/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.c
index 5dc9a8fe7..965b258a1 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.c
@@ -50,7 +50,7 @@
#include <mach/mt_typedefs.h>
#include <mach/mt_boot.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <cust_eint.h>
#include "tpd.h"
diff --git a/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.c b/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.c
index 0d8f1b7c6..c169f2904 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.c
@@ -50,7 +50,7 @@
#include <mach/mt_typedefs.h>
#include <mach/mt_boot.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <cust_eint.h>
#include "tpd.h"
diff --git a/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c b/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c
index 4f547668f..480c24d7e 100644
--- a/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c
+++ b/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c
@@ -19,7 +19,7 @@
#include <linux/rtpm_prio.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "tpd.h"
diff --git a/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c b/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c
index 51197f712..866f79058 100644
--- a/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c
+++ b/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c
@@ -18,7 +18,7 @@
#ifdef TPD_UPDATE_FIRMWARE
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/namei.h>
#include <linux/vmalloc.h>
diff --git a/drivers/input/touchscreen/mediatek/tpd_debug.c b/drivers/input/touchscreen/mediatek/tpd_debug.c
index 52370cbe2..214b091a4 100644
--- a/drivers/input/touchscreen/mediatek/tpd_debug.c
+++ b/drivers/input/touchscreen/mediatek/tpd_debug.c
@@ -1,5 +1,5 @@
#include <linux/vmalloc.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/major.h>
#include <linux/miscdevice.h>
#include <linux/i2c.h>
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
index c123709ac..dde8dbbcb 100644
--- a/drivers/isdn/capi/kcapi.c
+++ b/drivers/isdn/capi/kcapi.c
@@ -28,7 +28,7 @@
#include <linux/moduleparam.h>
#include <linux/delay.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/isdn/capicmd.h>
#include <linux/isdn/capiutil.h>
#ifdef AVMB1_COMPAT
diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
index 4d9b19554..9fdbd99c7 100644
--- a/drivers/isdn/hardware/avm/b1.c
+++ b/drivers/isdn/hardware/avm/b1.c
@@ -24,7 +24,7 @@
#include <linux/slab.h>
#include <asm/io.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/netdevice.h>
#include <linux/isdn/capilli.h>
#include "avmcard.h"
diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c
index 19b113fae..818bd8f23 100644
--- a/drivers/isdn/hardware/avm/b1dma.c
+++ b/drivers/isdn/hardware/avm/b1dma.c
@@ -23,7 +23,7 @@
#include <linux/gfp.h>
#include <asm/io.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/netdevice.h>
#include <linux/isdn/capilli.h>
#include "avmcard.h"
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index 5d00d72fe..17beb2869 100644
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -24,7 +24,7 @@
#include <linux/init.h>
#include <linux/gfp.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/netdevice.h>
#include <linux/isdn/capicmd.h>
#include <linux/isdn/capiutil.h>
diff --git a/drivers/isdn/hardware/eicon/capimain.c b/drivers/isdn/hardware/eicon/capimain.c
index 997d46abf..be36d8200 100644
--- a/drivers/isdn/hardware/eicon/capimain.c
+++ b/drivers/isdn/hardware/eicon/capimain.c
@@ -13,7 +13,7 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/seq_file.h>
#include <linux/skbuff.h>
diff --git a/drivers/isdn/hardware/eicon/divamnt.c b/drivers/isdn/hardware/eicon/divamnt.c
index 48db08d0b..93d1975f0 100644
--- a/drivers/isdn/hardware/eicon/divamnt.c
+++ b/drivers/isdn/hardware/eicon/divamnt.c
@@ -15,7 +15,7 @@
#include <linux/kernel.h>
#include <linux/poll.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "platform.h"
#include "di_defs.h"
diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c
index 4103a8c17..cb88090f9 100644
--- a/drivers/isdn/hardware/eicon/divasi.c
+++ b/drivers/isdn/hardware/eicon/divasi.c
@@ -18,7 +18,7 @@
#include <linux/proc_fs.h>
#include <linux/skbuff.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "platform.h"
#include "di_defs.h"
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index 52377b4bf..65adf3da5 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -12,7 +12,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <linux/ioport.h>
#include <linux/pci.h>
diff --git a/drivers/isdn/hardware/eicon/divasproc.c b/drivers/isdn/hardware/eicon/divasproc.c
index 56ce98a4e..b57efd6ad 100644
--- a/drivers/isdn/hardware/eicon/divasproc.c
+++ b/drivers/isdn/hardware/eicon/divasproc.c
@@ -16,7 +16,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/list.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "platform.h"
#include "debuglib.h"
diff --git a/drivers/isdn/hysdn/hysdn_boot.c b/drivers/isdn/hysdn/hysdn_boot.c
index eda4741e3..4a0425378 100644
--- a/drivers/isdn/hysdn/hysdn_boot.c
+++ b/drivers/isdn/hysdn/hysdn_boot.c
@@ -13,7 +13,7 @@
#include <linux/vmalloc.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "hysdn_defs.h"
#include "hysdn_pof.h"
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
index 19da22249..535594d9e 100644
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
@@ -15,7 +15,7 @@
#include <linux/slab.h>
#include <asm/paravirt.h>
#include <asm/pgtable.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/poll.h>
#include <asm/asm-offsets.h>
#include "lg.h"
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
index 5b9ac3280..0ea01f6f2 100644
--- a/drivers/lguest/page_tables.c
+++ b/drivers/lguest/page_tables.c
@@ -16,7 +16,7 @@
#include <linux/random.h>
#include <linux/percpu.h>
#include <asm/tlbflush.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "lg.h"
/*M:008
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
index 516923926..672f803f7 100644
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
@@ -45,7 +45,7 @@
#include <asm/desc.h>
#include <asm/setup.h>
#include <asm/lguest.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/i387.h>
#include "../lg.h"
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index b02689620..6b9db881a 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -38,7 +38,7 @@
#include <linux/platform_device.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef CONFIG_PPC
#include <asm/prom.h>
#include <asm/machdep.h>
diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c
index 1a57e88a3..701e1fdbd 100644
--- a/drivers/macintosh/ans-lcd.c
+++ b/drivers/macintosh/ans-lcd.c
@@ -11,7 +11,7 @@
#include <linux/delay.h>
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/sections.h>
#include <asm/prom.h>
#include <asm/io.h>
diff --git a/drivers/macintosh/nvram.c b/drivers/macintosh/nvram.c
index f0e03e793..bf3501a4f 100644
--- a/drivers/macintosh/nvram.c
+++ b/drivers/macintosh/nvram.c
@@ -13,7 +13,7 @@
#include <linux/fcntl.h>
#include <linux/nvram.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/nvram.h>
#define NVRAM_SIZE 8192
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index b3b2d36c0..58a51673e 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -45,7 +45,7 @@
#include <asm/pmac_feature.h>
#include <asm/smu.h>
#include <asm/sections.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define VERSION "0.7"
#define AUTHOR "(c) 2005 Benjamin Herrenschmidt, IBM Corp."
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 283e1b53c..aa568eefc 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -55,7 +55,7 @@
#include <asm/pmac_feature.h>
#include <asm/pmac_pfunc.h>
#include <asm/pmac_low_i2c.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/mmu_context.h>
#include <asm/cputable.h>
#include <asm/time.h>
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index a00ee41f0..a411c5cb7 100644
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -38,7 +38,7 @@
#include <asm/pgtable.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* Misc minor number allocated for /dev/pmu */
#define PMU_MINOR 154
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 85f45aa6c..221b984ea 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -17,7 +17,7 @@
#include <linux/hdreg.h>
#include <linux/compat.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define DM_MSG_PREFIX "ioctl"
#define DM_DRIVER_EMAIL "dm-devel@redhat.com"
diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 0b4616b87..16cd3f65f 100644
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -28,7 +28,7 @@
#include <linux/poll.h>
#include <linux/ioctl.h>
#include <linux/wait.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "dmxdev.h"
static int debug;
diff --git a/drivers/media/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c
index 3485655fa..703d58101 100644
--- a/drivers/media/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb-core/dvb_demux.c
@@ -29,7 +29,7 @@
#include <linux/poll.h>
#include <linux/string.h>
#include <linux/crc32.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/div64.h>
#include "dvb_demux.h"
diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
index f91c80c0e..9529759cc 100644
--- a/drivers/media/dvb-core/dvb_net.c
+++ b/drivers/media/dvb-core/dvb_net.c
@@ -60,7 +60,7 @@
#include <linux/etherdevice.h>
#include <linux/dvb/net.h>
#include <linux/uio.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/crc32.h>
#include <linux/mutex.h>
#include <linux/sched.h>
diff --git a/drivers/media/dvb-core/dvb_ringbuffer.c b/drivers/media/dvb-core/dvb_ringbuffer.c
index a5712cd7c..92533be15 100644
--- a/drivers/media/dvb-core/dvb_ringbuffer.c
+++ b/drivers/media/dvb-core/dvb_ringbuffer.c
@@ -31,7 +31,7 @@
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/string.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "dvb_ringbuffer.h"
diff --git a/drivers/media/i2c/adv7170.c b/drivers/media/i2c/adv7170.c
index 6bc01fb98..51ef82bee 100644
--- a/drivers/media/i2c/adv7170.c
+++ b/drivers/media/i2c/adv7170.c
@@ -32,7 +32,7 @@
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/ioctl.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/adv7175.c b/drivers/media/i2c/adv7175.c
index c7640fab5..e6646fb8c 100644
--- a/drivers/media/i2c/adv7175.c
+++ b/drivers/media/i2c/adv7175.c
@@ -28,7 +28,7 @@
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/ioctl.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/bt856.c b/drivers/media/i2c/bt856.c
index 7e5bd365c..4e6b995f3 100644
--- a/drivers/media/i2c/bt856.c
+++ b/drivers/media/i2c/bt856.c
@@ -32,7 +32,7 @@
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/ioctl.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/bt866.c b/drivers/media/i2c/bt866.c
index 905320b67..24eb50ba9 100644
--- a/drivers/media/i2c/bt866.c
+++ b/drivers/media/i2c/bt866.c
@@ -32,7 +32,7 @@
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/ioctl.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/cs53l32a.c b/drivers/media/i2c/cs53l32a.c
index b29391220..46165888b 100644
--- a/drivers/media/i2c/cs53l32a.c
+++ b/drivers/media/i2c/cs53l32a.c
@@ -24,7 +24,7 @@
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/ioctl.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/m52790.c b/drivers/media/i2c/m52790.c
index 39f50fd2b..d3778c2ae 100644
--- a/drivers/media/i2c/m52790.c
+++ b/drivers/media/i2c/m52790.c
@@ -24,7 +24,7 @@
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/ioctl.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/m52790.h>
diff --git a/drivers/media/i2c/saa6588.c b/drivers/media/i2c/saa6588.c
index b4e1ccbd8..1f1597c7e 100644
--- a/drivers/media/i2c/saa6588.c
+++ b/drivers/media/i2c/saa6588.c
@@ -29,7 +29,7 @@
#include <linux/slab.h>
#include <linux/poll.h>
#include <linux/wait.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <media/saa6588.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/saa7110.c b/drivers/media/i2c/saa7110.c
index 51cd4c8f0..ad22504bf 100644
--- a/drivers/media/i2c/saa7110.c
+++ b/drivers/media/i2c/saa7110.c
@@ -31,7 +31,7 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/wait.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/saa7185.c b/drivers/media/i2c/saa7185.c
index 2c6b65c76..faffd1e89 100644
--- a/drivers/media/i2c/saa7185.c
+++ b/drivers/media/i2c/saa7185.c
@@ -28,7 +28,7 @@
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/ioctl.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/tlv320aic23b.c b/drivers/media/i2c/tlv320aic23b.c
index 809a75a55..469a77cc2 100644
--- a/drivers/media/i2c/tlv320aic23b.c
+++ b/drivers/media/i2c/tlv320aic23b.c
@@ -27,7 +27,7 @@
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/ioctl.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/vp27smpx.c b/drivers/media/i2c/vp27smpx.c
index e71f13969..d3f2b101a 100644
--- a/drivers/media/i2c/vp27smpx.c
+++ b/drivers/media/i2c/vp27smpx.c
@@ -25,7 +25,7 @@
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/ioctl.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/vpx3220.c b/drivers/media/i2c/vpx3220.c
index 2f67b4c5c..25b2efffc 100644
--- a/drivers/media/i2c/vpx3220.c
+++ b/drivers/media/i2c/vpx3220.c
@@ -23,7 +23,7 @@
#include <linux/delay.h>
#include <linux/types.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/wm8739.c b/drivers/media/i2c/wm8739.c
index 3bb99e93f..eba14d705 100644
--- a/drivers/media/i2c/wm8739.c
+++ b/drivers/media/i2c/wm8739.c
@@ -25,7 +25,7 @@
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/ioctl.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/wm8775.c b/drivers/media/i2c/wm8775.c
index e5f3a78cf..6c29e45b0 100644
--- a/drivers/media/i2c/wm8775.c
+++ b/drivers/media/i2c/wm8775.c
@@ -29,7 +29,7 @@
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/ioctl.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/parport/bw-qcam.c b/drivers/media/parport/bw-qcam.c
index 06231b85e..6e91363c1 100644
--- a/drivers/media/parport/bw-qcam.c
+++ b/drivers/media/parport/bw-qcam.c
@@ -73,7 +73,7 @@ OTHER DEALINGS IN THE SOFTWARE.
#include <linux/sched.h>
#include <linux/videodev2.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include <media/v4l2-device.h>
diff --git a/drivers/media/parport/c-qcam.c b/drivers/media/parport/c-qcam.c
index ec51e1f12..50dda4165 100644
--- a/drivers/media/parport/c-qcam.c
+++ b/drivers/media/parport/c-qcam.c
@@ -36,7 +36,7 @@
#include <linux/mutex.h>
#include <linux/jiffies.h>
#include <linux/videodev2.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <media/v4l2-device.h>
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h
index bc309f42c..25194ebd8 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.h
+++ b/drivers/media/pci/ivtv/ivtv-driver.h
@@ -53,7 +53,7 @@
#include <linux/kthread.h>
#include <linux/mutex.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/byteorder.h>
#include <linux/dvb/video.h>
diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index 2381b0543..467d920b6 100644
--- a/drivers/media/pci/meye/meye.c
+++ b/drivers/media/pci/meye/meye.c
@@ -37,7 +37,7 @@
#include <media/v4l2-ioctl.h>
#include <media/v4l2-fh.h>
#include <media/v4l2-event.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/drivers/media/pci/zoran/videocodec.c b/drivers/media/pci/zoran/videocodec.c
index c01071635..698c2f726 100644
--- a/drivers/media/pci/zoran/videocodec.c
+++ b/drivers/media/pci/zoran/videocodec.c
@@ -40,7 +40,7 @@
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#endif
#include "videocodec.h"
diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
index d133c30c3..b1440e59a 100644
--- a/drivers/media/pci/zoran/zoran_driver.c
+++ b/drivers/media/pci/zoran/zoran_driver.c
@@ -65,7 +65,7 @@
#include <asm/byteorder.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/proc_fs.h>
#include <linux/mutex.h>
diff --git a/drivers/media/platform/arv.c b/drivers/media/platform/arv.c
index e346d32d0..8619b00d3 100644
--- a/drivers/media/platform/arv.c
+++ b/drivers/media/platform/arv.c
@@ -34,7 +34,7 @@
#include <media/v4l2-fh.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/m32r.h>
#include <asm/io.h>
#include <asm/dma.h>
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-ioread.c b/drivers/media/usb/pvrusb2/pvrusb2-ioread.c
index bba6115c9..5f1126e4d 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-ioread.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-ioread.c
@@ -25,7 +25,7 @@
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define BUFFER_COUNT 32
#define BUFFER_SIZE PAGE_ALIGN(0x4000)
diff --git a/drivers/media/usb/pwc/pwc-ctrl.c b/drivers/media/usb/pwc/pwc-ctrl.c
index 3a1618580..655cef39e 100644
--- a/drivers/media/usb/pwc/pwc-ctrl.c
+++ b/drivers/media/usb/pwc/pwc-ctrl.c
@@ -39,7 +39,7 @@
/* Control functions for the cam; brightness, contrast, video mode, etc. */
#ifdef __KERNEL__
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#endif
#include <asm/errno.h>
diff --git a/drivers/media/usb/sn9c102/sn9c102_core.c b/drivers/media/usb/sn9c102/sn9c102_core.c
index c957e9aa6..53391fded 100644
--- a/drivers/media/usb/sn9c102/sn9c102_core.c
+++ b/drivers/media/usb/sn9c102/sn9c102_core.c
@@ -37,7 +37,7 @@
#include <linux/page-flags.h>
#include <asm/byteorder.h>
#include <asm/page.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "sn9c102.h"
diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
index ec9a4fa3b..651e0d8e1 100644
--- a/drivers/media/v4l2-core/v4l2-common.c
+++ b/drivers/media/v4l2-core/v4l2-common.c
@@ -54,7 +54,7 @@
#if defined(CONFIG_SPI)
#include <linux/spi/spi.h>
#endif
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/pgtable.h>
#include <asm/io.h>
#include <asm/div64.h>
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index 5923c5dfa..99f0ad7cd 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -25,7 +25,7 @@
#include <linux/init.h>
#include <linux/kmod.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <media/v4l2-common.h>
#include <media/v4l2-device.h>
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index dcc8385ad..ca6ad9ce6 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -58,7 +58,7 @@
#include <linux/compat.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
diff --git a/drivers/message/fusion/mptlan.h b/drivers/message/fusion/mptlan.h
index 69e9d5463..8946e19db 100644
--- a/drivers/message/fusion/mptlan.h
+++ b/drivers/message/fusion/mptlan.h
@@ -70,7 +70,7 @@
#include <linux/workqueue.h>
#include <linux/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
/* Override mptbase.h by pre-defining these! */
diff --git a/drivers/message/i2o/config-osm.c b/drivers/message/i2o/config-osm.c
index 3bba7aa82..2731dceab 100644
--- a/drivers/message/i2o/config-osm.c
+++ b/drivers/message/i2o/config-osm.c
@@ -19,7 +19,7 @@
#include <linux/namei.h>
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define OSM_NAME "config-osm"
#define OSM_VERSION "1.323"
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index a60c188c2..50126de30 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -35,7 +35,7 @@
#include <linux/compat.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "core.h"
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
index b7d87cd22..9ce9af32f 100644
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/message/i2o/i2o_proc.c
@@ -50,7 +50,7 @@
#include <linux/workqueue.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/byteorder.h>
/* Structure used to define /proc entries */
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index ce5b75616..a02f35e69 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -76,7 +76,7 @@
#include <linux/fs.h>
#include <linux/pagemap.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include "ibmasm.h"
#include "remote.h"
diff --git a/drivers/misc/ltr559.c b/drivers/misc/ltr559.c
index e787602ff..8ca9062aa 100644
--- a/drivers/misc/ltr559.c
+++ b/drivers/misc/ltr559.c
@@ -30,7 +30,7 @@
#include <linux/slab.h>
#include <linux/wakelock.h>
#include <linux/workqueue.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/types.h>
#include <asm/setup.h>
#include <linux/version.h>
diff --git a/drivers/misc/mediatek/accdet/mt6735/accdet.h b/drivers/misc/mediatek/accdet/mt6735/accdet.h
index 2899e201e..e1ea6eb03 100644
--- a/drivers/misc/mediatek/accdet/mt6735/accdet.h
+++ b/drivers/misc/mediatek/accdet/mt6735/accdet.h
@@ -14,7 +14,7 @@
#include <linux/ctype.h>
#include <linux/semaphore.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <linux/workqueue.h>
#include <linux/switch.h>
@@ -24,7 +24,7 @@
#include <linux/kdev_t.h>
#include <linux/fs.h>
#include <linux/cdev.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/kthread.h>
#include <linux/input.h>
#include <linux/wakelock.h>
diff --git a/drivers/misc/mediatek/accdet/mt6735/accdet_hal.h b/drivers/misc/mediatek/accdet/mt6735/accdet_hal.h
index 9ce1310a9..388b22ff0 100644
--- a/drivers/misc/mediatek/accdet/mt6735/accdet_hal.h
+++ b/drivers/misc/mediatek/accdet/mt6735/accdet_hal.h
@@ -14,7 +14,7 @@
#include <linux/ctype.h>
#include <linux/semaphore.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <linux/workqueue.h>
#include <linux/switch.h>
@@ -24,7 +24,7 @@
#include <linux/kdev_t.h>
#include <linux/fs.h>
#include <linux/cdev.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/kthread.h>
#include <linux/input.h>
#include <linux/wakelock.h>
diff --git a/drivers/misc/mediatek/accdet/mt6735/ts3a225e.c b/drivers/misc/mediatek/accdet/mt6735/ts3a225e.c
index 69e12f4fb..cd0b8b641 100644
--- a/drivers/misc/mediatek/accdet/mt6735/ts3a225e.c
+++ b/drivers/misc/mediatek/accdet/mt6735/ts3a225e.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/KXTJ2_1009-new/kxtj2_1009.c b/drivers/misc/mediatek/accelerometer/KXTJ2_1009-new/kxtj2_1009.c
index 7551e26ec..35116fc4d 100644
--- a/drivers/misc/mediatek/accelerometer/KXTJ2_1009-new/kxtj2_1009.c
+++ b/drivers/misc/mediatek/accelerometer/KXTJ2_1009-new/kxtj2_1009.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/KXTJ2_1009/kxtj2_1009.c b/drivers/misc/mediatek/accelerometer/KXTJ2_1009/kxtj2_1009.c
index 41214152d..c9e7b8df5 100644
--- a/drivers/misc/mediatek/accelerometer/KXTJ2_1009/kxtj2_1009.c
+++ b/drivers/misc/mediatek/accelerometer/KXTJ2_1009/kxtj2_1009.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/bma050-new/bma050.c b/drivers/misc/mediatek/accelerometer/bma050-new/bma050.c
index f94c76f05..2cc769be9 100644
--- a/drivers/misc/mediatek/accelerometer/bma050-new/bma050.c
+++ b/drivers/misc/mediatek/accelerometer/bma050-new/bma050.c
@@ -13,7 +13,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/bma050/bma050.c b/drivers/misc/mediatek/accelerometer/bma050/bma050.c
index 2e5934728..58b83166f 100644
--- a/drivers/misc/mediatek/accelerometer/bma050/bma050.c
+++ b/drivers/misc/mediatek/accelerometer/bma050/bma050.c
@@ -13,7 +13,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/bma056/bma056.c b/drivers/misc/mediatek/accelerometer/bma056/bma056.c
index 3369d0b03..09ade4e30 100644
--- a/drivers/misc/mediatek/accelerometer/bma056/bma056.c
+++ b/drivers/misc/mediatek/accelerometer/bma056/bma056.c
@@ -13,7 +13,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/bma222E-new/bma222E.c b/drivers/misc/mediatek/accelerometer/bma222E-new/bma222E.c
index a6c2b9871..a2eb5a890 100644
--- a/drivers/misc/mediatek/accelerometer/bma222E-new/bma222E.c
+++ b/drivers/misc/mediatek/accelerometer/bma222E-new/bma222E.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/bma222E/bma222E.c b/drivers/misc/mediatek/accelerometer/bma222E/bma222E.c
index 86aa76994..09fc58701 100644
--- a/drivers/misc/mediatek/accelerometer/bma222E/bma222E.c
+++ b/drivers/misc/mediatek/accelerometer/bma222E/bma222E.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/bma250/bma250.c b/drivers/misc/mediatek/accelerometer/bma250/bma250.c
index 396db1c28..54697e70c 100644
--- a/drivers/misc/mediatek/accelerometer/bma250/bma250.c
+++ b/drivers/misc/mediatek/accelerometer/bma250/bma250.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/bma250e/bma250.c b/drivers/misc/mediatek/accelerometer/bma250e/bma250.c
index 53d5a8edd..af29a1fdc 100644
--- a/drivers/misc/mediatek/accelerometer/bma250e/bma250.c
+++ b/drivers/misc/mediatek/accelerometer/bma250e/bma250.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/bma255-sdo0/bma255.c b/drivers/misc/mediatek/accelerometer/bma255-sdo0/bma255.c
index 3dc22e039..ff060c8b4 100644
--- a/drivers/misc/mediatek/accelerometer/bma255-sdo0/bma255.c
+++ b/drivers/misc/mediatek/accelerometer/bma255-sdo0/bma255.c
@@ -13,7 +13,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/bma255-sdo1/bma255.c b/drivers/misc/mediatek/accelerometer/bma255-sdo1/bma255.c
index 9e03791f9..370e69aa3 100644
--- a/drivers/misc/mediatek/accelerometer/bma255-sdo1/bma255.c
+++ b/drivers/misc/mediatek/accelerometer/bma255-sdo1/bma255.c
@@ -13,7 +13,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/da213/mir3da_cust.c b/drivers/misc/mediatek/accelerometer/da213/mir3da_cust.c
index 07574a265..ed5483df9 100644
--- a/drivers/misc/mediatek/accelerometer/da213/mir3da_cust.c
+++ b/drivers/misc/mediatek/accelerometer/da213/mir3da_cust.c
@@ -19,7 +19,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/inc/accel_factory.h b/drivers/misc/mediatek/accelerometer/inc/accel_factory.h
index 0a9fa1706..2c0de6f62 100644
--- a/drivers/misc/mediatek/accelerometer/inc/accel_factory.h
+++ b/drivers/misc/mediatek/accelerometer/inc/accel_factory.h
@@ -6,7 +6,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/k2dh/k2dh.c b/drivers/misc/mediatek/accelerometer/k2dh/k2dh.c
index 72a51302d..af7fe8a3a 100644
--- a/drivers/misc/mediatek/accelerometer/k2dh/k2dh.c
+++ b/drivers/misc/mediatek/accelerometer/k2dh/k2dh.c
@@ -13,7 +13,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/kxtik1004/kxtik1004.c b/drivers/misc/mediatek/accelerometer/kxtik1004/kxtik1004.c
index b9e2ee114..26e4829ca 100644
--- a/drivers/misc/mediatek/accelerometer/kxtik1004/kxtik1004.c
+++ b/drivers/misc/mediatek/accelerometer/kxtik1004/kxtik1004.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/lsm6ds3/lsm6ds3.c b/drivers/misc/mediatek/accelerometer/lsm6ds3/lsm6ds3.c
index cb6c617d6..f5417397d 100644
--- a/drivers/misc/mediatek/accelerometer/lsm6ds3/lsm6ds3.c
+++ b/drivers/misc/mediatek/accelerometer/lsm6ds3/lsm6ds3.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/mc3410-new/mc3410.c b/drivers/misc/mediatek/accelerometer/mc3410-new/mc3410.c
index 013ade768..a0450807e 100644
--- a/drivers/misc/mediatek/accelerometer/mc3410-new/mc3410.c
+++ b/drivers/misc/mediatek/accelerometer/mc3410-new/mc3410.c
@@ -45,7 +45,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/mc3xxx_auto/mc3xxx.c b/drivers/misc/mediatek/accelerometer/mc3xxx_auto/mc3xxx.c
index 0b2606d4e..71d410767 100644
--- a/drivers/misc/mediatek/accelerometer/mc3xxx_auto/mc3xxx.c
+++ b/drivers/misc/mediatek/accelerometer/mc3xxx_auto/mc3xxx.c
@@ -39,7 +39,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/mpu6050g-new/mpu6050.c b/drivers/misc/mediatek/accelerometer/mpu6050g-new/mpu6050.c
index 5086d724c..3b42499e4 100644
--- a/drivers/misc/mediatek/accelerometer/mpu6050g-new/mpu6050.c
+++ b/drivers/misc/mediatek/accelerometer/mpu6050g-new/mpu6050.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6050.c b/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6050.c
index a972b92bf..738d7f2fb 100644
--- a/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6050.c
+++ b/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6050.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6xxx_hwselftest.c b/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6xxx_hwselftest.c
index c173ab0b1..d1adb2251 100644
--- a/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6xxx_hwselftest.c
+++ b/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6xxx_hwselftest.c
@@ -3,7 +3,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/mpu60x0/mpu60x0.c b/drivers/misc/mediatek/accelerometer/mpu60x0/mpu60x0.c
index ebb0c358d..7c24a3b17 100644
--- a/drivers/misc/mediatek/accelerometer/mpu60x0/mpu60x0.c
+++ b/drivers/misc/mediatek/accelerometer/mpu60x0/mpu60x0.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/mpu6515/mpu6515.c b/drivers/misc/mediatek/accelerometer/mpu6515/mpu6515.c
index db5b783bf..49d720d00 100644
--- a/drivers/misc/mediatek/accelerometer/mpu6515/mpu6515.c
+++ b/drivers/misc/mediatek/accelerometer/mpu6515/mpu6515.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/accelerometer/mxc400x-new/mxc400x.c b/drivers/misc/mediatek/accelerometer/mxc400x-new/mxc400x.c
index 84038b5ba..1bedf174e 100644
--- a/drivers/misc/mediatek/accelerometer/mxc400x-new/mxc400x.c
+++ b/drivers/misc/mediatek/accelerometer/mxc400x-new/mxc400x.c
@@ -27,7 +27,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/aee/aed/aed-debug.c b/drivers/misc/mediatek/aee/aed/aed-debug.c
index cdb683487..63182070a 100644
--- a/drivers/misc/mediatek/aee/aed/aed-debug.c
+++ b/drivers/misc/mediatek/aee/aed/aed-debug.c
@@ -9,7 +9,7 @@
#include <linux/cpumask.h>
#include <linux/slab.h>
#include <linux/kdebug.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#if defined(CONFIG_ARM_PSCI) || (CONFIG_ARM64)
#include <mach/mt_secure_api.h>
#endif
diff --git a/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c b/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c
index 549140ab6..4db7b90c6 100644
--- a/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c
+++ b/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c b/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c
index 13a0133a5..f5681e99a 100644
--- a/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c
+++ b/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c b/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c
index 1570ad07e..8796f3087 100644
--- a/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c
+++ b/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/aal_control.c b/drivers/misc/mediatek/alsps/aal_control.c
index 1971780e1..2e87422b8 100644
--- a/drivers/misc/mediatek/alsps/aal_control.c
+++ b/drivers/misc/mediatek/alsps/aal_control.c
@@ -4,7 +4,7 @@
#include <linux/init.h>
#include <linux/types.h>
#include <linux/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "alsps.h"
#include "aal_control.h"
#include <linux/hwmsen_dev.h>
diff --git a/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c b/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c
index 5eccbaa43..76a089bc6 100644
--- a/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c
+++ b/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c
@@ -3,7 +3,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c b/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c
index 8ca2b536d..1795fd178 100644
--- a/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c
+++ b/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c b/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c
index c6ae837ca..6c73d79f8 100644
--- a/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c
+++ b/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/cm36283/cm36283.c b/drivers/misc/mediatek/alsps/cm36283/cm36283.c
index a339e53e4..b20d71061 100644
--- a/drivers/misc/mediatek/alsps/cm36283/cm36283.c
+++ b/drivers/misc/mediatek/alsps/cm36283/cm36283.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c b/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c
index ae286ab03..d9ba00e45 100644
--- a/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c
+++ b/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/epl2182/epl2182.c b/drivers/misc/mediatek/alsps/epl2182/epl2182.c
index 5ca840381..348992e32 100644
--- a/drivers/misc/mediatek/alsps/epl2182/epl2182.c
+++ b/drivers/misc/mediatek/alsps/epl2182/epl2182.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/inc/alsps_factory.h b/drivers/misc/mediatek/alsps/inc/alsps_factory.h
index 3c544362c..8ca895073 100644
--- a/drivers/misc/mediatek/alsps/inc/alsps_factory.h
+++ b/drivers/misc/mediatek/alsps/inc/alsps_factory.h
@@ -6,7 +6,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/rpr410/rpr410.c b/drivers/misc/mediatek/alsps/rpr410/rpr410.c
index 36e5dab20..07b1d82bb 100644
--- a/drivers/misc/mediatek/alsps/rpr410/rpr410.c
+++ b/drivers/misc/mediatek/alsps/rpr410/rpr410.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c b/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c
index 6658dba2b..478c63e8c 100644
--- a/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c
+++ b/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c
@@ -23,7 +23,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c b/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c
index a9923b327..adc8aaa1d 100644
--- a/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c
+++ b/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c b/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c
index b4b3a7d89..746eadaac 100644
--- a/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c
+++ b/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c b/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c
index 9f786b457..455737afe 100644
--- a/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c
+++ b/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/auxadc/mt6735/mt_auxadc_hal.c b/drivers/misc/mediatek/auxadc/mt6735/mt_auxadc_hal.c
index 4e661bbb9..699478b07 100644
--- a/drivers/misc/mediatek/auxadc/mt6735/mt_auxadc_hal.c
+++ b/drivers/misc/mediatek/auxadc/mt6735/mt_auxadc_hal.c
@@ -37,7 +37,7 @@
#include <linux/proc_fs.h>
#include <linux/kthread.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>
diff --git a/drivers/misc/mediatek/auxadc/mt_auxadc.c b/drivers/misc/mediatek/auxadc/mt_auxadc.c
index b89dbf132..c82068608 100644
--- a/drivers/misc/mediatek/auxadc/mt_auxadc.c
+++ b/drivers/misc/mediatek/auxadc/mt_auxadc.c
@@ -38,7 +38,7 @@
#include <linux/kthread.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <mach/mt_gpt.h>
diff --git a/drivers/misc/mediatek/barometer/inc/barometer_factory.h b/drivers/misc/mediatek/barometer/inc/barometer_factory.h
index 9c0caecbe..da3d3e679 100644
--- a/drivers/misc/mediatek/barometer/inc/barometer_factory.h
+++ b/drivers/misc/mediatek/barometer/inc/barometer_factory.h
@@ -6,7 +6,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/barometer/ms5607/ms5607.c b/drivers/misc/mediatek/barometer/ms5607/ms5607.c
index 33a99fdcb..70e99017c 100644
--- a/drivers/misc/mediatek/barometer/ms5607/ms5607.c
+++ b/drivers/misc/mediatek/barometer/ms5607/ms5607.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/btcvsd/mt6735/AudDrv_BTCVSD.c b/drivers/misc/mediatek/btcvsd/mt6735/AudDrv_BTCVSD.c
index f380a5a07..41a577894 100644
--- a/drivers/misc/mediatek/btcvsd/mt6735/AudDrv_BTCVSD.c
+++ b/drivers/misc/mediatek/btcvsd/mt6735/AudDrv_BTCVSD.c
@@ -77,7 +77,7 @@
#include <linux/xlog.h>
#include <mach/irqs.h>
#include <mach/mt_irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/irq.h>
#include <asm/io.h>
#include <mach/mt_reg_base.h>
diff --git a/drivers/misc/mediatek/bthid/hid_keyboard.c b/drivers/misc/mediatek/bthid/hid_keyboard.c
index 9270d98ff..34aa72843 100644
--- a/drivers/misc/mediatek/bthid/hid_keyboard.c
+++ b/drivers/misc/mediatek/bthid/hid_keyboard.c
@@ -15,7 +15,7 @@
#include <linux/device.h>
#include <linux/errno.h>
#include <asm/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define HID_SAY "HID:"
diff --git a/drivers/misc/mediatek/ccci_util/ccci_private_log.c b/drivers/misc/mediatek/ccci_util/ccci_private_log.c
index eabd8e806..33c0cf76a 100644
--- a/drivers/misc/mediatek/ccci_util/ccci_private_log.c
+++ b/drivers/misc/mediatek/ccci_util/ccci_private_log.c
@@ -3,7 +3,7 @@
#include <linux/spinlock.h>
#include <linux/smp.h>
#include <linux/poll.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/wait.h>
#include <linux/sched.h>
#include <linux/skbuff.h>
diff --git a/drivers/misc/mediatek/connectivity/common/combo/core/stp_exp.c b/drivers/misc/mediatek/connectivity/common/combo/core/stp_exp.c
index 556d211d2..dae6fc757 100644
--- a/drivers/misc/mediatek/connectivity/common/combo/core/stp_exp.c
+++ b/drivers/misc/mediatek/connectivity/common/combo/core/stp_exp.c
@@ -25,7 +25,7 @@
#include <linux/spinlock.h>
#include <linux/delay.h> /* udelay() */
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/system.h>
#endif
#include "stp_core.h"
diff --git a/drivers/misc/mediatek/connectivity/common/combo/linux/include/osal.h b/drivers/misc/mediatek/connectivity/common/combo/linux/include/osal.h
index 4b3bbc2ce..a7d7036b7 100644
--- a/drivers/misc/mediatek/connectivity/common/combo/linux/include/osal.h
+++ b/drivers/misc/mediatek/connectivity/common/combo/linux/include/osal.h
@@ -19,7 +19,7 @@
#include <linux/sched.h>
#include <linux/poll.h>
#include <asm/current.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/proc_fs.h>
#include <linux/workqueue.h>
#include <linux/wait.h>
diff --git a/drivers/misc/mediatek/connectivity/common/combo/linux/stp_chrdev_bt.c b/drivers/misc/mediatek/connectivity/common/combo/linux/stp_chrdev_bt.c
index 06052d002..98e911f52 100644
--- a/drivers/misc/mediatek/connectivity/common/combo/linux/stp_chrdev_bt.c
+++ b/drivers/misc/mediatek/connectivity/common/combo/linux/stp_chrdev_bt.c
@@ -6,7 +6,7 @@
#include <linux/cdev.h>
#include <linux/sched.h>
#include <asm/current.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/fcntl.h>
#include <linux/poll.h>
#include <linux/time.h>
diff --git a/drivers/misc/mediatek/connectivity/common/combo/linux/wmt_chrdev_wifi.c b/drivers/misc/mediatek/connectivity/common/combo/linux/wmt_chrdev_wifi.c
index ba980993e..35d8132bd 100644
--- a/drivers/misc/mediatek/connectivity/common/combo/linux/wmt_chrdev_wifi.c
+++ b/drivers/misc/mediatek/connectivity/common/combo/linux/wmt_chrdev_wifi.c
@@ -6,7 +6,7 @@
#include <linux/cdev.h>
#include <linux/sched.h>
#include <asm/current.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/fcntl.h>
#include <linux/poll.h>
#include <linux/time.h>
diff --git a/drivers/misc/mediatek/connectivity/common/common_detect/wmt_detect.h b/drivers/misc/mediatek/connectivity/common/common_detect/wmt_detect.h
index 7e152bfd3..93c350da8 100644
--- a/drivers/misc/mediatek/connectivity/common/common_detect/wmt_detect.h
+++ b/drivers/misc/mediatek/connectivity/common/common_detect/wmt_detect.h
@@ -25,7 +25,7 @@
#include <linux/sched.h>
#include <linux/poll.h>
#include <asm/current.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/proc_fs.h>
#include <linux/wait.h>
#include <linux/time.h>
diff --git a/drivers/misc/mediatek/connectivity/common/common_detect/wmt_stp_exp.h b/drivers/misc/mediatek/connectivity/common/common_detect/wmt_stp_exp.h
index 6f8942e68..f830e026b 100644
--- a/drivers/misc/mediatek/connectivity/common/common_detect/wmt_stp_exp.h
+++ b/drivers/misc/mediatek/connectivity/common/common_detect/wmt_stp_exp.h
@@ -24,7 +24,7 @@
#include <linux/sched.h>
#include <linux/poll.h>
#include <asm/current.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/proc_fs.h>
#include <linux/workqueue.h>
#include <linux/wait.h>
diff --git a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/include/osal_typedef.h b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/include/osal_typedef.h
index 67381e4c9..f14d4f6c7 100644
--- a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/include/osal_typedef.h
+++ b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/include/osal_typedef.h
@@ -31,7 +31,7 @@
#include <linux/sched.h>
#include <linux/poll.h>
#include <asm/current.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <linux/proc_fs.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pri/stp_exp.c b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pri/stp_exp.c
index f7f4aff01..15d3717bb 100644
--- a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pri/stp_exp.c
+++ b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pri/stp_exp.c
@@ -39,7 +39,7 @@
#include <linux/spinlock.h>
#include <linux/delay.h> /* udelay() */
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "osal_typedef.h"
diff --git a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/stp_chrdev_bt.c b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/stp_chrdev_bt.c
index 8fdb7e172..560ee945d 100644
--- a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/stp_chrdev_bt.c
+++ b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/stp_chrdev_bt.c
@@ -20,7 +20,7 @@
#include <linux/cdev.h>
#include <linux/sched.h>
#include <asm/current.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/fcntl.h>
#include <linux/poll.h>
#include <linux/time.h>
diff --git a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/wmt_chrdev_wifi.c b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/wmt_chrdev_wifi.c
index a075f46b5..083601180 100644
--- a/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/wmt_chrdev_wifi.c
+++ b/drivers/misc/mediatek/connectivity/common/conn_soc/linux/pub/wmt_chrdev_wifi.c
@@ -20,7 +20,7 @@
#include <linux/cdev.h>
#include <linux/sched.h>
#include <asm/current.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/fcntl.h>
#include <linux/poll.h>
#include <linux/time.h>
diff --git a/drivers/misc/mediatek/connectivity/gps/gps.c b/drivers/misc/mediatek/connectivity/gps/gps.c
index f161c2389..1841f62e8 100644
--- a/drivers/misc/mediatek/connectivity/gps/gps.c
+++ b/drivers/misc/mediatek/connectivity/gps/gps.c
@@ -33,7 +33,7 @@
#include <linux/cdev.h>
#include <linux/errno.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* #include <linux/xlog.h> */
#include <linux/printk.h>
#include <linux/semaphore.h>
diff --git a/drivers/misc/mediatek/connectivity/gps/stp_chrdev_gps.c b/drivers/misc/mediatek/connectivity/gps/stp_chrdev_gps.c
index 40901a3dd..4635ba8fc 100644
--- a/drivers/misc/mediatek/connectivity/gps/stp_chrdev_gps.c
+++ b/drivers/misc/mediatek/connectivity/gps/stp_chrdev_gps.c
@@ -20,7 +20,7 @@
#include <linux/sched.h>
#include <linux/wakelock.h>
#include <asm/current.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/skbuff.h>
#if WMT_CREATE_NODE_DYNAMIC || REMOVE_MK_NODE
#include <linux/device.h>
diff --git a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/hif/ahb/mt6735/ahb_pdma.c b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/hif/ahb/mt6735/ahb_pdma.c
index 4500f1ddc..ec651f0ab 100644
--- a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/hif/ahb/mt6735/ahb_pdma.c
+++ b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/hif/ahb/mt6735/ahb_pdma.c
@@ -59,7 +59,7 @@
#include <linux/rtnetlink.h> /* for rtnl_lock() and rtnl_unlock() */
#include <linux/kthread.h> /* kthread_should_stop(), kthread_run() */
-#include <asm/uaccess.h> /* for copy_from_user() */
+#include <linux/uaccess.h> /* for copy_from_user() */
#include <linux/fs.h> /* for firmware download */
#include <linux/vmalloc.h>
diff --git a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/include/gl_os.h b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/include/gl_os.h
index e7f29e1ba..39d238174 100644
--- a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/include/gl_os.h
+++ b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/include/gl_os.h
@@ -562,7 +562,7 @@
#include <linux/rtnetlink.h> /* for rtnl_lock() and rtnl_unlock() */
#include <linux/kthread.h> /* kthread_should_stop(), kthread_run() */
-#include <asm/uaccess.h> /* for copy_from_user() */
+#include <linux/uaccess.h> /* for copy_from_user() */
#include <linux/fs.h> /* for firmware download */
#include <linux/vmalloc.h>
diff --git a/drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/include/gl_os.h b/drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/include/gl_os.h
index 4bfa68750..3b4151a9a 100644
--- a/drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/include/gl_os.h
+++ b/drivers/misc/mediatek/connectivity/wlan/gen3/os/linux/include/gl_os.h
@@ -562,7 +562,7 @@
#include <linux/rtnetlink.h> /* for rtnl_lock() and rtnl_unlock() */
#include <linux/kthread.h> /* kthread_should_stop(), kthread_run() */
-#include <asm/uaccess.h> /* for copy_from_user() */
+#include <linux/uaccess.h> /* for copy_from_user() */
#include <linux/fs.h> /* for firmware download */
#include <linux/vmalloc.h>
diff --git a/drivers/misc/mediatek/devinfo/mt6735/devinfo.c b/drivers/misc/mediatek/devinfo/mt6735/devinfo.c
index 0f16de7c3..0cc54c5dc 100644
--- a/drivers/misc/mediatek/devinfo/mt6735/devinfo.c
+++ b/drivers/misc/mediatek/devinfo/mt6735/devinfo.c
@@ -20,7 +20,7 @@
#include <linux/mm.h>
#include <linux/slab.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/ioctl.h>
#include <linux/device.h>
#ifdef CONFIG_OF
diff --git a/drivers/misc/mediatek/devinfo/mt6735/devinfosys.c b/drivers/misc/mediatek/devinfo/mt6735/devinfosys.c
index 1b0acbd42..a1ea989bb 100644
--- a/drivers/misc/mediatek/devinfo/mt6735/devinfosys.c
+++ b/drivers/misc/mediatek/devinfo/mt6735/devinfosys.c
@@ -19,7 +19,7 @@
#include <linux/cdev.h>
#include <linux/mm.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/ioctl.h>
#include <linux/device.h>
#include <linux/platform_device.h>
diff --git a/drivers/misc/mediatek/dispsys/mt6735/ddp_aal.c b/drivers/misc/mediatek/dispsys/mt6735/ddp_aal.c
index b3fd1f50e..d86411161 100644
--- a/drivers/misc/mediatek/dispsys/mt6735/ddp_aal.c
+++ b/drivers/misc/mediatek/dispsys/mt6735/ddp_aal.c
@@ -4,7 +4,7 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/leds-mt65xx.h>
#include <linux/aal_api.h>
diff --git a/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.c b/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.c
index 1a80ca406..cb7aebdaf 100644
--- a/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.c
+++ b/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.c
@@ -1,5 +1,5 @@
#include <linux/kernel.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/slab.h>
#include <linux/mutex.h>
#include <mach/mt_clkmgr.h>
diff --git a/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.h b/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.h
index 3ab26e508..6cd7f2555 100644
--- a/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.h
+++ b/drivers/misc/mediatek/dispsys/mt6735/ddp_gamma.h
@@ -1,7 +1,7 @@
#ifndef __DDP_GAMMA_H__
#define __DDP_GAMMA_H__
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
typedef enum {
diff --git a/drivers/misc/mediatek/dispsys/mt6735/ddp_od.c b/drivers/misc/mediatek/dispsys/mt6735/ddp_od.c
index da958f5a2..357dac2db 100644
--- a/drivers/misc/mediatek/dispsys/mt6735/ddp_od.c
+++ b/drivers/misc/mediatek/dispsys/mt6735/ddp_od.c
@@ -6,7 +6,7 @@
#include <linux/dma-mapping.h>
#include <mach/memory.h>
#include "ddp_wdma.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_irq.h>
#include <mach/mt_clkmgr.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/misc/mediatek/eemcs/eemcs_file_ops.c b/drivers/misc/mediatek/eemcs/eemcs_file_ops.c
index 81cdb3694..9f6b0656c 100644
--- a/drivers/misc/mediatek/eemcs/eemcs_file_ops.c
+++ b/drivers/misc/mediatek/eemcs/eemcs_file_ops.c
@@ -6,7 +6,7 @@
#include <linux/mm.h>
#include <linux/namei.h>
#include <asm/segment.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
struct file* file_open(const char* path, int flags, int rights) {
struct file* filp = NULL;
diff --git a/drivers/misc/mediatek/eemcs/eemcs_file_ops.h b/drivers/misc/mediatek/eemcs/eemcs_file_ops.h
index c9b0224f6..4a26010df 100644
--- a/drivers/misc/mediatek/eemcs/eemcs_file_ops.h
+++ b/drivers/misc/mediatek/eemcs/eemcs_file_ops.h
@@ -5,7 +5,7 @@
#include <linux/file.h>
#include <linux/mm.h>
#include <asm/segment.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
struct file* file_open(const char* path, int flags, int rights);
void file_close(struct file* file);
diff --git a/drivers/misc/mediatek/ext_disp/mt6735/extd_factory.c b/drivers/misc/mediatek/ext_disp/mt6735/extd_factory.c
index 73d1805a6..9900ccfbc 100644
--- a/drivers/misc/mediatek/ext_disp/mt6735/extd_factory.c
+++ b/drivers/misc/mediatek/ext_disp/mt6735/extd_factory.c
@@ -1,5 +1,5 @@
#include <linux/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "extd_factory.h"
#include "external_display.h"
diff --git a/drivers/misc/mediatek/ext_disp/mt6735/extd_hdmi_drv.c b/drivers/misc/mediatek/ext_disp/mt6735/extd_hdmi_drv.c
index 610dcde0a..28bb45f95 100644
--- a/drivers/misc/mediatek/ext_disp/mt6735/extd_hdmi_drv.c
+++ b/drivers/misc/mediatek/ext_disp/mt6735/extd_hdmi_drv.c
@@ -27,7 +27,7 @@
#include <linux/switch.h>
#include <linux/mmprofile.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
//#include <asm/mach-types.h>
#include <asm/cacheflush.h>
diff --git a/drivers/misc/mediatek/ext_disp/mt6735/mtk_ext_disp_mgr.c b/drivers/misc/mediatek/ext_disp/mt6735/mtk_ext_disp_mgr.c
index 00714fca7..1db3b600f 100644
--- a/drivers/misc/mediatek/ext_disp/mt6735/mtk_ext_disp_mgr.c
+++ b/drivers/misc/mediatek/ext_disp/mt6735/mtk_ext_disp_mgr.c
@@ -17,7 +17,7 @@
#include <linux/list.h>
#include <linux/switch.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
//#include <asm/mach-types.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/constant_flashlight/leds_strobe.c b/drivers/misc/mediatek/flashlight/src/mt6735/constant_flashlight/leds_strobe.c
index 9a12362e7..c332583d0 100644
--- a/drivers/misc/mediatek/flashlight/src/mt6735/constant_flashlight/leds_strobe.c
+++ b/drivers/misc/mediatek/flashlight/src/mt6735/constant_flashlight/leds_strobe.c
@@ -16,7 +16,7 @@
#include <linux/time.h>
#include "kd_flashlight.h"
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "kd_camera_hw.h"
#include <cust_gpio_usage.h>
#include <cust_i2c.h>
diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/dummy_flashlight/dummy_flashlight.c b/drivers/misc/mediatek/flashlight/src/mt6735/dummy_flashlight/dummy_flashlight.c
index b56e36285..261f442fd 100644
--- a/drivers/misc/mediatek/flashlight/src/mt6735/dummy_flashlight/dummy_flashlight.c
+++ b/drivers/misc/mediatek/flashlight/src/mt6735/dummy_flashlight/dummy_flashlight.c
@@ -16,7 +16,7 @@
#include <linux/time.h>
#include "kd_flashlight.h"
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/xlog.h>
//#include <mach/mt6516_typedefs.h>
//#include <mach/mt6516_gpt_sw.h>
diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/kd_flashlightlist.c b/drivers/misc/mediatek/flashlight/src/mt6735/kd_flashlightlist.c
index 0e8999d5b..9af83d32a 100644
--- a/drivers/misc/mediatek/flashlight/src/mt6735/kd_flashlightlist.c
+++ b/drivers/misc/mediatek/flashlight/src/mt6735/kd_flashlightlist.c
@@ -27,7 +27,7 @@
#include <linux/errno.h>
#include <linux/time.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "kd_camera_hw.h"
#include <mach/upmu_sw.h>
#endif
diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid1_part2.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid1_part2.c
index 9bd53a063..2c9cfd70b 100644
--- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid1_part2.c
+++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid1_part2.c
@@ -22,7 +22,7 @@
#include <linux/errno.h>
#include <linux/time.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "kd_camera_hw.h"
#include <cust_gpio_usage.h>
#include <linux/hrtimer.h>
diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part1.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part1.c
index c0c7e1bf1..87dc5e994 100644
--- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part1.c
+++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part1.c
@@ -21,7 +21,7 @@
#include <linux/errno.h>
#include <linux/time.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "kd_camera_hw.h"
#include <cust_gpio_usage.h>
#include <linux/hrtimer.h>
diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part2.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part2.c
index 0b1e2849f..8c574b3d2 100644
--- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part2.c
+++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part2.c
@@ -15,7 +15,7 @@
#include <linux/errno.h>
#include <linux/time.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "kd_camera_hw.h"
#include <cust_gpio_usage.h>
#include <linux/hrtimer.h>
diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_part_id.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_part_id.c
index 4cd059ccb..c998f01e0 100644
--- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_part_id.c
+++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_part_id.c
@@ -16,7 +16,7 @@
#include <linux/errno.h>
#include <linux/time.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "kd_camera_hw.h"
#ifdef CONFIG_COMPAT
#include <linux/fs.h>
diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid1_part2.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid1_part2.c
index 662239024..8554af2df 100644
--- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid1_part2.c
+++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid1_part2.c
@@ -16,7 +16,7 @@
#include <linux/errno.h>
#include <linux/time.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "kd_camera_hw.h"
#include <cust_gpio_usage.h>
#include <linux/hrtimer.h>
diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part1.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part1.c
index 8e026ecc4..4f96a9900 100644
--- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part1.c
+++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part1.c
@@ -17,7 +17,7 @@
#include <linux/time.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "kd_camera_hw.h"
#include <cust_gpio_usage.h>
#include <linux/hrtimer.h>
diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part2.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part2.c
index d0d8c1fd8..0e2f6ece9 100644
--- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part2.c
+++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part2.c
@@ -16,7 +16,7 @@
#include <linux/errno.h>
#include <linux/time.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "kd_camera_hw.h"
#include <cust_gpio_usage.h>
#include <linux/hrtimer.h>
diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/sub_strobe.c b/drivers/misc/mediatek/flashlight/src/mt6735/sub_strobe.c
index ecaac71d2..44b499050 100644
--- a/drivers/misc/mediatek/flashlight/src/mt6735/sub_strobe.c
+++ b/drivers/misc/mediatek/flashlight/src/mt6735/sub_strobe.c
@@ -16,7 +16,7 @@
#include <linux/errno.h>
#include <linux/time.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "kd_camera_hw.h"
#include <cust_gpio_usage.h>
#include <linux/hrtimer.h>
diff --git a/drivers/misc/mediatek/gpio/mt_gpio_core.c b/drivers/misc/mediatek/gpio/mt_gpio_core.c
index 4183140f6..ad5461801 100644
--- a/drivers/misc/mediatek/gpio/mt_gpio_core.c
+++ b/drivers/misc/mediatek/gpio/mt_gpio_core.c
@@ -21,7 +21,7 @@
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/cdev.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/atomic.h>
#include <linux/miscdevice.h>
diff --git a/drivers/misc/mediatek/gpu/ged/src/ged_base.c b/drivers/misc/mediatek/gpu/ged/src/ged_base.c
index 91ed382ca..713c2055e 100644
--- a/drivers/misc/mediatek/gpu/ged/src/ged_base.c
+++ b/drivers/misc/mediatek/gpu/ged/src/ged_base.c
@@ -20,7 +20,7 @@
#endif
#endif
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
unsigned long ged_copy_to_user(void __user *pvTo, const void *pvFrom, unsigned long ulBytes)
{
diff --git a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/dma_buf_lock/src/dma_buf_lock.c b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/dma_buf_lock/src/dma_buf_lock.c
index 9a0b35b05..714e62092 100644
--- a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/dma_buf_lock/src/dma_buf_lock.c
+++ b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/dma_buf_lock/src/dma_buf_lock.c
@@ -15,7 +15,7 @@
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/fs.h>
diff --git a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/ump/src/linux/ump_kernel_linux.c b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/ump/src/linux/ump_kernel_linux.c
index b4d024299..8a06ef2b5 100644
--- a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/ump/src/linux/ump_kernel_linux.c
+++ b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/base/ump/src/linux/ump_kernel_linux.c
@@ -20,7 +20,7 @@
#include <linux/ump-ioctl.h>
#include <linux/ump.h>
-#include <asm/uaccess.h> /* copy_*_user */
+#include <linux/uaccess.h> /* copy_*_user */
#include <linux/compat.h>
#include <linux/module.h> /* kernel module definitions */
#include <linux/fs.h> /* file system operations */
diff --git a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c
index c2fd3c1f2..63122610b 100644
--- a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c
+++ b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c
@@ -28,7 +28,7 @@
#include <linux/seq_file.h>
#include <linux/debugfs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/module.h>
#include <linux/proc_fs.h>
diff --git a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/dma_buf_lock/src/dma_buf_lock.c b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/dma_buf_lock/src/dma_buf_lock.c
index 9a0b35b05..714e62092 100644
--- a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/dma_buf_lock/src/dma_buf_lock.c
+++ b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/dma_buf_lock/src/dma_buf_lock.c
@@ -15,7 +15,7 @@
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/fs.h>
diff --git a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/ump/src/linux/ump_kernel_linux.c b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/ump/src/linux/ump_kernel_linux.c
index b4d024299..8a06ef2b5 100644
--- a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/ump/src/linux/ump_kernel_linux.c
+++ b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/base/ump/src/linux/ump_kernel_linux.c
@@ -20,7 +20,7 @@
#include <linux/ump-ioctl.h>
#include <linux/ump.h>
-#include <asm/uaccess.h> /* copy_*_user */
+#include <linux/uaccess.h> /* copy_*_user */
#include <linux/compat.h>
#include <linux/module.h> /* kernel module definitions */
#include <linux/fs.h> /* file system operations */
diff --git a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c
index 32b8cd3a6..d6cbfac6b 100644
--- a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c
+++ b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/mali_kbase_pm_metrics.c
@@ -28,7 +28,7 @@
#include <linux/seq_file.h>
#include <linux/debugfs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/module.h>
#include <linux/proc_fs.h>
diff --git a/drivers/misc/mediatek/gyroscope/ITG1010-new/ITG1010.c b/drivers/misc/mediatek/gyroscope/ITG1010-new/ITG1010.c
index fe63f0204..234472f44 100644
--- a/drivers/misc/mediatek/gyroscope/ITG1010-new/ITG1010.c
+++ b/drivers/misc/mediatek/gyroscope/ITG1010-new/ITG1010.c
@@ -22,7 +22,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/gyroscope/inc/gyro_factory.h b/drivers/misc/mediatek/gyroscope/inc/gyro_factory.h
index 70fb5efdb..68582cb35 100644
--- a/drivers/misc/mediatek/gyroscope/inc/gyro_factory.h
+++ b/drivers/misc/mediatek/gyroscope/inc/gyro_factory.h
@@ -6,7 +6,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/gyroscope/l3g4200d/l3g4200d.c b/drivers/misc/mediatek/gyroscope/l3g4200d/l3g4200d.c
index 263fbc0b5..980cc9f50 100644
--- a/drivers/misc/mediatek/gyroscope/l3g4200d/l3g4200d.c
+++ b/drivers/misc/mediatek/gyroscope/l3g4200d/l3g4200d.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/gyroscope/l3gd20/l3gd20.c b/drivers/misc/mediatek/gyroscope/l3gd20/l3gd20.c
index 2d6967261..375d8977b 100644
--- a/drivers/misc/mediatek/gyroscope/l3gd20/l3gd20.c
+++ b/drivers/misc/mediatek/gyroscope/l3gd20/l3gd20.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/gyroscope/lsm6ds0/lsm6ds0.c b/drivers/misc/mediatek/gyroscope/lsm6ds0/lsm6ds0.c
index 74ed90643..9582f8ba5 100644
--- a/drivers/misc/mediatek/gyroscope/lsm6ds0/lsm6ds0.c
+++ b/drivers/misc/mediatek/gyroscope/lsm6ds0/lsm6ds0.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/gyroscope/lsm6ds3gy/lsm6ds3_gy.c b/drivers/misc/mediatek/gyroscope/lsm6ds3gy/lsm6ds3_gy.c
index 1f07c3160..bcb0b14bf 100644
--- a/drivers/misc/mediatek/gyroscope/lsm6ds3gy/lsm6ds3_gy.c
+++ b/drivers/misc/mediatek/gyroscope/lsm6ds3gy/lsm6ds3_gy.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/gyroscope/mpu3000-new/mpu3000.c b/drivers/misc/mediatek/gyroscope/mpu3000-new/mpu3000.c
index 3babd0179..7fabd9ff2 100644
--- a/drivers/misc/mediatek/gyroscope/mpu3000-new/mpu3000.c
+++ b/drivers/misc/mediatek/gyroscope/mpu3000-new/mpu3000.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/gyroscope/mpu3000/mpu3000.c b/drivers/misc/mediatek/gyroscope/mpu3000/mpu3000.c
index 0b1f90de0..8a997a8b5 100644
--- a/drivers/misc/mediatek/gyroscope/mpu3000/mpu3000.c
+++ b/drivers/misc/mediatek/gyroscope/mpu3000/mpu3000.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/gyroscope/mpu3050c-new/mpu3050c.c b/drivers/misc/mediatek/gyroscope/mpu3050c-new/mpu3050c.c
index b079437bd..699d287a1 100644
--- a/drivers/misc/mediatek/gyroscope/mpu3050c-new/mpu3050c.c
+++ b/drivers/misc/mediatek/gyroscope/mpu3050c-new/mpu3050c.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/gyroscope/mpu3050c/mpu3050c.c b/drivers/misc/mediatek/gyroscope/mpu3050c/mpu3050c.c
index 80f69b9e7..cb6dae43f 100644
--- a/drivers/misc/mediatek/gyroscope/mpu3050c/mpu3050c.c
+++ b/drivers/misc/mediatek/gyroscope/mpu3050c/mpu3050c.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/gyroscope/mpu6050c/mpu6050c.c b/drivers/misc/mediatek/gyroscope/mpu6050c/mpu6050c.c
index 01242552c..66d266306 100644
--- a/drivers/misc/mediatek/gyroscope/mpu6050c/mpu6050c.c
+++ b/drivers/misc/mediatek/gyroscope/mpu6050c/mpu6050c.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/gyroscope/mpu6050gy-new/mpu6050.c b/drivers/misc/mediatek/gyroscope/mpu6050gy-new/mpu6050.c
index d64a9fbb3..e421feced 100644
--- a/drivers/misc/mediatek/gyroscope/mpu6050gy-new/mpu6050.c
+++ b/drivers/misc/mediatek/gyroscope/mpu6050gy-new/mpu6050.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/gyroscope/mpu6050gy/mpu6050.c b/drivers/misc/mediatek/gyroscope/mpu6050gy/mpu6050.c
index 3d75b2361..9a12fc9cf 100644
--- a/drivers/misc/mediatek/gyroscope/mpu6050gy/mpu6050.c
+++ b/drivers/misc/mediatek/gyroscope/mpu6050gy/mpu6050.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/gyroscope/mpu6515/mpu6515.c b/drivers/misc/mediatek/gyroscope/mpu6515/mpu6515.c
index bff296970..f87b0f9a7 100644
--- a/drivers/misc/mediatek/gyroscope/mpu6515/mpu6515.c
+++ b/drivers/misc/mediatek/gyroscope/mpu6515/mpu6515.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/hdmi/Sii8338/mhl_linuxdrv_ioctl.c b/drivers/misc/mediatek/hdmi/Sii8338/mhl_linuxdrv_ioctl.c
index 78222847a..a6add7fc4 100644
--- a/drivers/misc/mediatek/hdmi/Sii8338/mhl_linuxdrv_ioctl.c
+++ b/drivers/misc/mediatek/hdmi/Sii8338/mhl_linuxdrv_ioctl.c
@@ -2,7 +2,7 @@
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/timer.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mhl_linuxdrv.h"
#include "sii_hal.h"
#include "mhl_linuxdrv_ioctl.h"
diff --git a/drivers/misc/mediatek/hdmi/Sii8338/smartbook.c b/drivers/misc/mediatek/hdmi/Sii8338/smartbook.c
index d66f86014..bc13a3601 100644
--- a/drivers/misc/mediatek/hdmi/Sii8338/smartbook.c
+++ b/drivers/misc/mediatek/hdmi/Sii8338/smartbook.c
@@ -11,7 +11,7 @@
#include <linux/time.h>
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/power_supply.h>
#include <linux/kthread.h>
#include <linux/wakelock.h>
diff --git a/drivers/misc/mediatek/hdmi/Sii8348/mhl_linux_tx.c b/drivers/misc/mediatek/hdmi/Sii8348/mhl_linux_tx.c
index 3a2d57b6e..58479767f 100644
--- a/drivers/misc/mediatek/hdmi/Sii8348/mhl_linux_tx.c
+++ b/drivers/misc/mediatek/hdmi/Sii8348/mhl_linux_tx.c
@@ -24,7 +24,7 @@ the GNU General Public License for more details at http://www.gnu.org/licenses/g
#include <linux/interrupt.h>
#include <linux/cdev.h>
#include <linux/stringify.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "sii_hal.h"
#include "si_fw_macros.h"
diff --git a/drivers/misc/mediatek/hdmi/Sii8348/smartbook.c b/drivers/misc/mediatek/hdmi/Sii8348/smartbook.c
index 71e573684..2c687264c 100644
--- a/drivers/misc/mediatek/hdmi/Sii8348/smartbook.c
+++ b/drivers/misc/mediatek/hdmi/Sii8348/smartbook.c
@@ -9,7 +9,7 @@
#include <linux/time.h>
#include <linux/device.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/power_supply.h>
#include <linux/kthread.h>
#include <linux/wakelock.h>
diff --git a/drivers/misc/mediatek/hdmi/mt8193/hdmi_drv.c b/drivers/misc/mediatek/hdmi/mt8193/hdmi_drv.c
index d45a102ab..314e6a132 100644
--- a/drivers/misc/mediatek/hdmi/mt8193/hdmi_drv.c
+++ b/drivers/misc/mediatek/hdmi/mt8193/hdmi_drv.c
@@ -6,7 +6,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/hdmi/mt8193/mt8193_ctrl.h b/drivers/misc/mediatek/hdmi/mt8193/mt8193_ctrl.h
index 9a7a8eeaa..248f99ccf 100644
--- a/drivers/misc/mediatek/hdmi/mt8193/mt8193_ctrl.h
+++ b/drivers/misc/mediatek/hdmi/mt8193/mt8193_ctrl.h
@@ -7,7 +7,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/hdmi/mt8193/mt8193avd.h b/drivers/misc/mediatek/hdmi/mt8193/mt8193avd.h
index 116fbc418..05266931a 100644
--- a/drivers/misc/mediatek/hdmi/mt8193/mt8193avd.h
+++ b/drivers/misc/mediatek/hdmi/mt8193/mt8193avd.h
@@ -7,7 +7,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/hdmi/mt8193/mt8193cec.c b/drivers/misc/mediatek/hdmi/mt8193/mt8193cec.c
index ddef83e6b..d973ad3bb 100644
--- a/drivers/misc/mediatek/hdmi/mt8193/mt8193cec.c
+++ b/drivers/misc/mediatek/hdmi/mt8193/mt8193cec.c
@@ -5,7 +5,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/hdmi/mt8193/mt8193edid.c b/drivers/misc/mediatek/hdmi/mt8193/mt8193edid.c
index 6e593cede..4c8551b29 100644
--- a/drivers/misc/mediatek/hdmi/mt8193/mt8193edid.c
+++ b/drivers/misc/mediatek/hdmi/mt8193/mt8193edid.c
@@ -5,7 +5,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/hdmi/mt8193/mt8193hdmictrl.h b/drivers/misc/mediatek/hdmi/mt8193/mt8193hdmictrl.h
index 853ee22e8..7ed40e66e 100644
--- a/drivers/misc/mediatek/hdmi/mt8193/mt8193hdmictrl.h
+++ b/drivers/misc/mediatek/hdmi/mt8193/mt8193hdmictrl.h
@@ -8,7 +8,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/hdmi/nxp_tda19989/hdmi_drv.c b/drivers/misc/mediatek/hdmi/nxp_tda19989/hdmi_drv.c
index 1c0747c5e..2ee7e6ee6 100644
--- a/drivers/misc/mediatek/hdmi/nxp_tda19989/hdmi_drv.c
+++ b/drivers/misc/mediatek/hdmi/nxp_tda19989/hdmi_drv.c
@@ -21,7 +21,7 @@
#include <linux/vmalloc.h>
#include <linux/disp_assert_layer.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <asm/mach-types.h>
#include <asm/cacheflush.h>
@@ -39,7 +39,7 @@
#include <asm/tlbflush.h>
#include <asm/page.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/slab.h>
#include <generated/autoconf.h>
@@ -54,7 +54,7 @@
#include <linux/kthread.h>
#include <linux/rtpm_prio.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <asm/mach-types.h>
#include <asm/cacheflush.h>
@@ -64,7 +64,7 @@
#include <mach/irqs.h>
#include <linux/vmalloc.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifndef TMFL_TDA19989
#define TMFL_TDA19989
diff --git a/drivers/misc/mediatek/hdmi/nxp_tda19989/tmdlHdmiTx_cfg.c b/drivers/misc/mediatek/hdmi/nxp_tda19989/tmdlHdmiTx_cfg.c
index d334f8e8b..57d0160fe 100644
--- a/drivers/misc/mediatek/hdmi/nxp_tda19989/tmdlHdmiTx_cfg.c
+++ b/drivers/misc/mediatek/hdmi/nxp_tda19989/tmdlHdmiTx_cfg.c
@@ -61,7 +61,7 @@
#include <linux/delay.h>
#include <linux/workqueue.h>
#include <linux/interrupt.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_gpio.h>
#include <linux/slab.h>
#include "tmNxCompId.h"
diff --git a/drivers/misc/mediatek/hdmi/sil9024/hdmi_drv.c b/drivers/misc/mediatek/hdmi/sil9024/hdmi_drv.c
index 28ad7b7e9..d346af13a 100644
--- a/drivers/misc/mediatek/hdmi/sil9024/hdmi_drv.c
+++ b/drivers/misc/mediatek/hdmi/sil9024/hdmi_drv.c
@@ -3,7 +3,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/hwmon/batchsen/batch.c b/drivers/misc/mediatek/hwmon/batchsen/batch.c
index 601a889fb..18e2aa1d5 100644
--- a/drivers/misc/mediatek/hwmon/batchsen/batch.c
+++ b/drivers/misc/mediatek/hwmon/batchsen/batch.c
@@ -2,7 +2,7 @@
#include <linux/batch.h>
#include <linux/time.h>
#include <linux/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static DEFINE_MUTEX(batch_data_mutex);
static DEFINE_MUTEX(batch_hw_mutex);
diff --git a/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_dev.c b/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_dev.c
index 1c901b8f7..319ccbc9d 100644
--- a/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_dev.c
+++ b/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_dev.c
@@ -22,7 +22,7 @@
#include <linux/interrupt.h>
#include <linux/miscdevice.h>
#include <linux/platform_device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_helper.c b/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_helper.c
index 1454fb19c..5ef29aac9 100644
--- a/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_helper.c
+++ b/drivers/misc/mediatek/hwmon/hwmsen/hwmsen_helper.c
@@ -29,7 +29,7 @@
#include <linux/types.h>
#include <linux/device.h>
#include <linux/spinlock.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/atomic.h>
#include <linux/ctype.h>
diff --git a/drivers/misc/mediatek/kernel/mtk_memcfg.c b/drivers/misc/mediatek/kernel/mtk_memcfg.c
index 971d8e3c6..96cb9fc65 100644
--- a/drivers/misc/mediatek/kernel/mtk_memcfg.c
+++ b/drivers/misc/mediatek/kernel/mtk_memcfg.c
@@ -8,7 +8,7 @@
#include <linux/aee.h>
#include <linux/kthread.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/setup.h>
#include <mach/mtk_memcfg.h>
#include <linux/of_fdt.h>
diff --git a/drivers/misc/mediatek/kernel/sec_osal.c b/drivers/misc/mediatek/kernel/sec_osal.c
index 10319fee8..ed68f87f9 100644
--- a/drivers/misc/mediatek/kernel/sec_osal.c
+++ b/drivers/misc/mediatek/kernel/sec_osal.c
@@ -13,7 +13,7 @@
#include <linux/mtd/mtd.h>
#include <linux/fs.h>
#include <linux/mtd/partitions.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/slab.h>
#include <linux/version.h>
#include <linux/module.h>
diff --git a/drivers/misc/mediatek/lcm/cpt_clap070wp03xg_sn65dsi83/sn65dsi83_i2c.c b/drivers/misc/mediatek/lcm/cpt_clap070wp03xg_sn65dsi83/sn65dsi83_i2c.c
index 0fb5c07c0..c9c918af9 100644
--- a/drivers/misc/mediatek/lcm/cpt_clap070wp03xg_sn65dsi83/sn65dsi83_i2c.c
+++ b/drivers/misc/mediatek/lcm/cpt_clap070wp03xg_sn65dsi83/sn65dsi83_i2c.c
@@ -4,7 +4,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/lcm/it6121_g156xw01v1_lvds_vdo/it6121_i2c.c b/drivers/misc/mediatek/lcm/it6121_g156xw01v1_lvds_vdo/it6121_i2c.c
index 958a30ba3..241dd30b8 100644
--- a/drivers/misc/mediatek/lcm/it6121_g156xw01v1_lvds_vdo/it6121_i2c.c
+++ b/drivers/misc/mediatek/lcm/it6121_g156xw01v1_lvds_vdo/it6121_i2c.c
@@ -4,7 +4,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/lcm/it6151_edp_dsi_video_sharp/it6151_i2c.c b/drivers/misc/mediatek/lcm/it6151_edp_dsi_video_sharp/it6151_i2c.c
index e30ba0364..89536c65f 100644
--- a/drivers/misc/mediatek/lcm/it6151_edp_dsi_video_sharp/it6151_i2c.c
+++ b/drivers/misc/mediatek/lcm/it6151_edp_dsi_video_sharp/it6151_i2c.c
@@ -4,7 +4,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/lcm/it6151_fhd_edp_dsi_video_auo/it6151_i2c.c b/drivers/misc/mediatek/lcm/it6151_fhd_edp_dsi_video_auo/it6151_i2c.c
index 1bf65ccc6..a6f68223a 100644
--- a/drivers/misc/mediatek/lcm/it6151_fhd_edp_dsi_video_auo/it6151_i2c.c
+++ b/drivers/misc/mediatek/lcm/it6151_fhd_edp_dsi_video_auo/it6151_i2c.c
@@ -4,7 +4,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video/it6151_i2c.c b/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video/it6151_i2c.c
index 0f460c99f..7f3ddcb27 100644
--- a/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video/it6151_i2c.c
+++ b/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video/it6151_i2c.c
@@ -4,7 +4,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video_8163evb/it6151_i2c.c b/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video_8163evb/it6151_i2c.c
index ae10206bb..6820e84dc 100644
--- a/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video_8163evb/it6151_i2c.c
+++ b/drivers/misc/mediatek/lcm/it6151_lp079qx1_edp_dsi_video_8163evb/it6151_i2c.c
@@ -4,7 +4,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/camera_fdvt_D1.c b/drivers/misc/mediatek/mach/mt6735/camera_fdvt_D1.c
index d213de426..b37b5389d 100644
--- a/drivers/misc/mediatek/mach/mt6735/camera_fdvt_D1.c
+++ b/drivers/misc/mediatek/mach/mt6735/camera_fdvt_D1.c
@@ -12,7 +12,7 @@
#include <linux/mm.h>
#include <linux/jiffies.h>
#include <linux/sched.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/page.h>
#include <linux/vmalloc.h>
#include <linux/interrupt.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/cpu_hibernate.c b/drivers/misc/mediatek/mach/mt6735/cpu_hibernate.c
index bf8fd5f04..0aa6b4699 100644
--- a/drivers/misc/mediatek/mach/mt6735/cpu_hibernate.c
+++ b/drivers/misc/mediatek/mach/mt6735/cpu_hibernate.c
@@ -14,7 +14,7 @@
#include <linux/device.h>
#include <linux/suspend.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/tlbflush.h>
#include <asm/suspend.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/fliper/fliper.c b/drivers/misc/mediatek/mach/mt6735/fliper/fliper.c
index 82dac77c1..569041059 100644
--- a/drivers/misc/mediatek/mach/mt6735/fliper/fliper.c
+++ b/drivers/misc/mediatek/mach/mt6735/fliper/fliper.c
@@ -5,7 +5,7 @@
#include <linux/utsname.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/printk.h>
#include <linux/platform_device.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/hibernate64.c b/drivers/misc/mediatek/mach/mt6735/hibernate64.c
index b264cf135..fbe7a1ff7 100644
--- a/drivers/misc/mediatek/mach/mt6735/hibernate64.c
+++ b/drivers/misc/mediatek/mach/mt6735/hibernate64.c
@@ -12,7 +12,7 @@
#include <linux/suspend.h>
#include <linux/mm.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/tlbflush.h>
#include <asm/cacheflush.h>
#include <asm/system_misc.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/include/mach/mt_thermal.h b/drivers/misc/mediatek/mach/mt6735/include/mach/mt_thermal.h
index b17629661..783869b6e 100644
--- a/drivers/misc/mediatek/mach/mt6735/include/mach/mt_thermal.h
+++ b/drivers/misc/mediatek/mach/mt6735/include/mach/mt_thermal.h
@@ -8,7 +8,7 @@
#include <linux/interrupt.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mach/sync_write.h"
#include "mach/mt_reg_base.h"
diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/sound/yusu_android_speaker.c b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/sound/yusu_android_speaker.c
index 492b9b663..6e49e0189 100644
--- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/sound/yusu_android_speaker.c
+++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/sound/yusu_android_speaker.c
@@ -17,7 +17,7 @@
#include <linux/wait.h>
#include <linux/spinlock.h>
#include <linux/semaphore.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include "yusu_android_speaker.h"
diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_generic.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_generic.h
index 74a377109..efbc5f15a 100644
--- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_generic.h
+++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_generic.h
@@ -48,7 +48,7 @@
#include <linux/time.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/***************************PART1:ON/OFF define*******************************/
diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_tpd_custom.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_tpd_custom.h
index 2ca6f89fb..5ebb0b54b 100644
--- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_tpd_custom.h
+++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT1151/gt1x_tpd_custom.h
@@ -21,7 +21,7 @@
#ifndef GT1X_TPD_CUSTOM_H__
#define GT1X_TPD_CUSTOM_H__
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/rtpm_prio.h>
#include <mach/mt_pm_ldo.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h
index 60121299f..1fbd560d0 100644
--- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h
+++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h
@@ -27,7 +27,7 @@
#include <linux/rtpm_prio.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_pm_ldo.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h
index d414387fd..48bd0fe7f 100644
--- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h
+++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65c_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h
@@ -27,7 +27,7 @@
#include <linux/rtpm_prio.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_pm_ldo.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/sound/yusu_android_speaker.c b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/sound/yusu_android_speaker.c
index 492b9b663..6e49e0189 100644
--- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/sound/yusu_android_speaker.c
+++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/sound/yusu_android_speaker.c
@@ -17,7 +17,7 @@
#include <linux/wait.h>
#include <linux/spinlock.h>
#include <linux/semaphore.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include "yusu_android_speaker.h"
diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_generic.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_generic.h
index 74a377109..efbc5f15a 100644
--- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_generic.h
+++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_generic.h
@@ -48,7 +48,7 @@
#include <linux/time.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/***************************PART1:ON/OFF define*******************************/
diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_tpd_custom.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_tpd_custom.h
index 2ca6f89fb..5ebb0b54b 100644
--- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_tpd_custom.h
+++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT1151/gt1x_tpd_custom.h
@@ -21,7 +21,7 @@
#ifndef GT1X_TPD_CUSTOM_H__
#define GT1X_TPD_CUSTOM_H__
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/rtpm_prio.h>
#include <mach/mt_pm_ldo.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h
index 60121299f..1fbd560d0 100644
--- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h
+++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot/tpd_custom_gt9xx.h
@@ -27,7 +27,7 @@
#include <linux/rtpm_prio.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_pm_ldo.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h
index d414387fd..48bd0fe7f 100644
--- a/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h
+++ b/drivers/misc/mediatek/mach/mt6735/meizu6753_65u_l1/touchpanel/GT9XX_hotknot_SCP/tpd_custom_gt9xx.h
@@ -27,7 +27,7 @@
#include <linux/rtpm_prio.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_pm_ldo.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr.c b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr.c
index 5050c81f2..4a426f9cd 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr.c
@@ -7,7 +7,7 @@
#include <linux/spinlock.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/smp.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr2.c b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr2.c
index 04379232d..5b0b16fab 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr2.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr2.c
@@ -7,7 +7,7 @@
#include <linux/spinlock.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/smp.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr3.c b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr3.c
index d2874d906..339c41efb 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr3.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr3.c
@@ -7,7 +7,7 @@
#include <linux/spinlock.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/smp.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr_legacy.c b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr_legacy.c
index fba266b58..cc96dd276 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_clkmgr_legacy.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_clkmgr_legacy.c
@@ -7,7 +7,7 @@
#include <linux/spinlock.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/smp.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_cpu_ss.c b/drivers/misc/mediatek/mach/mt6735/mt_cpu_ss.c
index b1a470916..e9999b3b5 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_cpu_ss.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_cpu_ss.c
@@ -18,7 +18,7 @@
#include <linux/xlog.h>
#include <linux/jiffies.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/seq_file.h>
#include "mach/sync_write.h"
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_gpufreq.c b/drivers/misc/mediatek/mach/mt6735/mt_gpufreq.c
index 378364dbf..05f9094a8 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_gpufreq.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_gpufreq.c
@@ -32,7 +32,7 @@
#include <linux/of_address.h>
#endif
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mach/mt_typedefs.h"
#include "mach/mt_clkmgr.h"
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c b/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c
index 33d4ceba5..c3403a4ad 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c
@@ -12,7 +12,7 @@
#include <linux/init.h> //module_init, module_exit
#include <linux/proc_fs.h> //proc_mkdir, proc_create
#include <linux/seq_file.h> //seq_printf, single_open
-#include <asm/uaccess.h> //copy_from_user
+#include <linux/uaccess.h> //copy_from_user
// project includes
#include <mach/hotplug.h>
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_pm_init.c b/drivers/misc/mediatek/mach/mt6735/mt_pm_init.c
index f6cbdca13..c14b0aeb1 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_pm_init.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_pm_init.c
@@ -12,7 +12,7 @@
#include <linux/xlog.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mach/irqs.h"
#include "mach/sync_write.h"
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_pm_ldo.c b/drivers/misc/mediatek/mach/mt6735/mt_pm_ldo.c
index 58f69a242..2827cd726 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_pm_ldo.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_pm_ldo.c
@@ -9,7 +9,7 @@
#include <linux/init.h>
#include <linux/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_typedefs.h>
#include <mach/mt_pm_ldo.h>
diff --git a/drivers/misc/mediatek/magnetometer/af7133/af7133.c b/drivers/misc/mediatek/magnetometer/af7133/af7133.c
index fcde86a14..b2b5c7d10 100644
--- a/drivers/misc/mediatek/magnetometer/af7133/af7133.c
+++ b/drivers/misc/mediatek/magnetometer/af7133/af7133.c
@@ -19,7 +19,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/akm09911-new/akm09911.c b/drivers/misc/mediatek/magnetometer/akm09911-new/akm09911.c
index 839c28326..37a6efc48 100644
--- a/drivers/misc/mediatek/magnetometer/akm09911-new/akm09911.c
+++ b/drivers/misc/mediatek/magnetometer/akm09911-new/akm09911.c
@@ -23,7 +23,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/akm09911/akm09911.c b/drivers/misc/mediatek/magnetometer/akm09911/akm09911.c
index 44135a39c..fcbb45f3a 100644
--- a/drivers/misc/mediatek/magnetometer/akm09911/akm09911.c
+++ b/drivers/misc/mediatek/magnetometer/akm09911/akm09911.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/akm8963-new/akm8963.c b/drivers/misc/mediatek/magnetometer/akm8963-new/akm8963.c
index b4f64c5a6..a94b697c4 100644
--- a/drivers/misc/mediatek/magnetometer/akm8963-new/akm8963.c
+++ b/drivers/misc/mediatek/magnetometer/akm8963-new/akm8963.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/akm8963/akm8963.c b/drivers/misc/mediatek/magnetometer/akm8963/akm8963.c
index 5e55b7811..01d2bffb7 100644
--- a/drivers/misc/mediatek/magnetometer/akm8963/akm8963.c
+++ b/drivers/misc/mediatek/magnetometer/akm8963/akm8963.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/akm8975/akm8975.c b/drivers/misc/mediatek/magnetometer/akm8975/akm8975.c
index bab870222..09cb9e419 100644
--- a/drivers/misc/mediatek/magnetometer/akm8975/akm8975.c
+++ b/drivers/misc/mediatek/magnetometer/akm8975/akm8975.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/akm8975_auto/akm8975.c b/drivers/misc/mediatek/magnetometer/akm8975_auto/akm8975.c
index e81accb0e..8a4298afd 100644
--- a/drivers/misc/mediatek/magnetometer/akm8975_auto/akm8975.c
+++ b/drivers/misc/mediatek/magnetometer/akm8975_auto/akm8975.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/ami304/ami304.c b/drivers/misc/mediatek/magnetometer/ami304/ami304.c
index 26b4d928d..c936b9d74 100644
--- a/drivers/misc/mediatek/magnetometer/ami304/ami304.c
+++ b/drivers/misc/mediatek/magnetometer/ami304/ami304.c
@@ -19,7 +19,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/ami304_auto/ami304.c b/drivers/misc/mediatek/magnetometer/ami304_auto/ami304.c
index c5d765eb7..6cc1cb3a8 100644
--- a/drivers/misc/mediatek/magnetometer/ami304_auto/ami304.c
+++ b/drivers/misc/mediatek/magnetometer/ami304_auto/ami304.c
@@ -19,7 +19,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/bmm050-new/bmm050.c b/drivers/misc/mediatek/magnetometer/bmm050-new/bmm050.c
index 4c15f715a..aecd6b642 100644
--- a/drivers/misc/mediatek/magnetometer/bmm050-new/bmm050.c
+++ b/drivers/misc/mediatek/magnetometer/bmm050-new/bmm050.c
@@ -13,7 +13,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/bmm050/bmm050.c b/drivers/misc/mediatek/magnetometer/bmm050/bmm050.c
index d546b8474..95ac7ddcb 100644
--- a/drivers/misc/mediatek/magnetometer/bmm050/bmm050.c
+++ b/drivers/misc/mediatek/magnetometer/bmm050/bmm050.c
@@ -13,7 +13,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/bmm056-new/bmm056.c b/drivers/misc/mediatek/magnetometer/bmm056-new/bmm056.c
index 256d8270b..78ea20f14 100644
--- a/drivers/misc/mediatek/magnetometer/bmm056-new/bmm056.c
+++ b/drivers/misc/mediatek/magnetometer/bmm056-new/bmm056.c
@@ -13,7 +13,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/bmm056/bmm056.c b/drivers/misc/mediatek/magnetometer/bmm056/bmm056.c
index 91d2903f6..94828b257 100644
--- a/drivers/misc/mediatek/magnetometer/bmm056/bmm056.c
+++ b/drivers/misc/mediatek/magnetometer/bmm056/bmm056.c
@@ -13,7 +13,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/bmm150/bmm150.c b/drivers/misc/mediatek/magnetometer/bmm150/bmm150.c
index b639d973e..ee56f8475 100644
--- a/drivers/misc/mediatek/magnetometer/bmm150/bmm150.c
+++ b/drivers/misc/mediatek/magnetometer/bmm150/bmm150.c
@@ -19,7 +19,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/hscdtd006/hscdtd006.c b/drivers/misc/mediatek/magnetometer/hscdtd006/hscdtd006.c
index e71dc05f1..76be4cd59 100644
--- a/drivers/misc/mediatek/magnetometer/hscdtd006/hscdtd006.c
+++ b/drivers/misc/mediatek/magnetometer/hscdtd006/hscdtd006.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/hscdtd006_auto/hscdtd006_auto.c b/drivers/misc/mediatek/magnetometer/hscdtd006_auto/hscdtd006_auto.c
index 440263d80..63ada8f10 100644
--- a/drivers/misc/mediatek/magnetometer/hscdtd006_auto/hscdtd006_auto.c
+++ b/drivers/misc/mediatek/magnetometer/hscdtd006_auto/hscdtd006_auto.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/inc/mag_factory.h b/drivers/misc/mediatek/magnetometer/inc/mag_factory.h
index 47e8da743..574092c22 100644
--- a/drivers/misc/mediatek/magnetometer/inc/mag_factory.h
+++ b/drivers/misc/mediatek/magnetometer/inc/mag_factory.h
@@ -6,7 +6,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/magnetometer/ist8303-new/ist8303.c b/drivers/misc/mediatek/magnetometer/ist8303-new/ist8303.c
index 8c05026c4..aede23cbf 100644
--- a/drivers/misc/mediatek/magnetometer/ist8303-new/ist8303.c
+++ b/drivers/misc/mediatek/magnetometer/ist8303-new/ist8303.c
@@ -19,7 +19,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/lsm303c-new/lsm303c.c b/drivers/misc/mediatek/magnetometer/lsm303c-new/lsm303c.c
index 9284e7a58..d3f018de7 100644
--- a/drivers/misc/mediatek/magnetometer/lsm303c-new/lsm303c.c
+++ b/drivers/misc/mediatek/magnetometer/lsm303c-new/lsm303c.c
@@ -20,7 +20,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/lsm303m/lsm303m.c b/drivers/misc/mediatek/magnetometer/lsm303m/lsm303m.c
index 62b2b9a3b..aee823dd2 100644
--- a/drivers/misc/mediatek/magnetometer/lsm303m/lsm303m.c
+++ b/drivers/misc/mediatek/magnetometer/lsm303m/lsm303m.c
@@ -20,7 +20,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/mag3110/mag3110.c b/drivers/misc/mediatek/magnetometer/mag3110/mag3110.c
index 37ac7adf8..d1274f2db 100644
--- a/drivers/misc/mediatek/magnetometer/mag3110/mag3110.c
+++ b/drivers/misc/mediatek/magnetometer/mag3110/mag3110.c
@@ -19,7 +19,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/mc41xx/mc41xx.c b/drivers/misc/mediatek/magnetometer/mc41xx/mc41xx.c
index 3b2b0faff..9cf9eda3f 100644
--- a/drivers/misc/mediatek/magnetometer/mc41xx/mc41xx.c
+++ b/drivers/misc/mediatek/magnetometer/mc41xx/mc41xx.c
@@ -39,7 +39,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/mc6420/mc6420.c b/drivers/misc/mediatek/magnetometer/mc6420/mc6420.c
index 739b7767b..6edcf140e 100644
--- a/drivers/misc/mediatek/magnetometer/mc6420/mc6420.c
+++ b/drivers/misc/mediatek/magnetometer/mc6420/mc6420.c
@@ -23,7 +23,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/mc64xx/mc64xx.c b/drivers/misc/mediatek/magnetometer/mc64xx/mc64xx.c
index 9f489deb9..bf8ddb031 100644
--- a/drivers/misc/mediatek/magnetometer/mc64xx/mc64xx.c
+++ b/drivers/misc/mediatek/magnetometer/mc64xx/mc64xx.c
@@ -39,7 +39,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/mmc328x/mmc328x.c b/drivers/misc/mediatek/magnetometer/mmc328x/mmc328x.c
index 3d490edfc..e05ebdc64 100644
--- a/drivers/misc/mediatek/magnetometer/mmc328x/mmc328x.c
+++ b/drivers/misc/mediatek/magnetometer/mmc328x/mmc328x.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/mmc328x_auto/mmc328x.c b/drivers/misc/mediatek/magnetometer/mmc328x_auto/mmc328x.c
index d562f0d1b..dc848a892 100644
--- a/drivers/misc/mediatek/magnetometer/mmc328x_auto/mmc328x.c
+++ b/drivers/misc/mediatek/magnetometer/mmc328x_auto/mmc328x.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/mmc328xma/mmc328x.c b/drivers/misc/mediatek/magnetometer/mmc328xma/mmc328x.c
index 50a1dd90e..9961be4a7 100644
--- a/drivers/misc/mediatek/magnetometer/mmc328xma/mmc328x.c
+++ b/drivers/misc/mediatek/magnetometer/mmc328xma/mmc328x.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/mmc3416x/mmc3416x.c b/drivers/misc/mediatek/magnetometer/mmc3416x/mmc3416x.c
index 64f26a457..784120a2f 100644
--- a/drivers/misc/mediatek/magnetometer/mmc3416x/mmc3416x.c
+++ b/drivers/misc/mediatek/magnetometer/mmc3416x/mmc3416x.c
@@ -23,7 +23,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/qmc5983/qmc5983.c b/drivers/misc/mediatek/magnetometer/qmc5983/qmc5983.c
index 289b55ed7..814e63885 100644
--- a/drivers/misc/mediatek/magnetometer/qmc5983/qmc5983.c
+++ b/drivers/misc/mediatek/magnetometer/qmc5983/qmc5983.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/s62x/s62x.c b/drivers/misc/mediatek/magnetometer/s62x/s62x.c
index 6379791a3..7e6ac149a 100644
--- a/drivers/misc/mediatek/magnetometer/s62x/s62x.c
+++ b/drivers/misc/mediatek/magnetometer/s62x/s62x.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/st480/st480.h b/drivers/misc/mediatek/magnetometer/st480/st480.h
index 00d3f96cd..6f7c46efb 100644
--- a/drivers/misc/mediatek/magnetometer/st480/st480.h
+++ b/drivers/misc/mediatek/magnetometer/st480/st480.h
@@ -9,7 +9,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/input.h>
diff --git a/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.h b/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.h
index 847762300..33bd23d9b 100644
--- a/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.h
+++ b/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.h
@@ -50,7 +50,7 @@
#ifdef __LINUX_KERNEL_DRIVER__
#include <linux/types.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/kernel.h>
#include <linux/slab.h>
diff --git a/drivers/misc/mediatek/masp/asfv2/core/sec_mod_core.c b/drivers/misc/mediatek/masp/asfv2/core/sec_mod_core.c
index 217c39e5d..85c80833c 100644
--- a/drivers/misc/mediatek/masp/asfv2/core/sec_mod_core.c
+++ b/drivers/misc/mediatek/masp/asfv2/core/sec_mod_core.c
@@ -6,7 +6,7 @@
* INCLUDE LINUX HEADER
******************************************************************************/
#include <linux/module.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/ioctl.h>
/******************************************************************************
diff --git a/drivers/misc/mediatek/masp/asfv2/core/sec_osal.c b/drivers/misc/mediatek/masp/asfv2/core/sec_osal.c
index 1ebbd60d0..1300baa0f 100644
--- a/drivers/misc/mediatek/masp/asfv2/core/sec_osal.c
+++ b/drivers/misc/mediatek/masp/asfv2/core/sec_osal.c
@@ -12,7 +12,7 @@
#include <linux/mutex.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/slab.h>
#include <linux/version.h>
#include <linux/module.h>
diff --git a/drivers/misc/mediatek/masp/asfv2/module/sec_mod.c b/drivers/misc/mediatek/masp/asfv2/module/sec_mod.c
index ec99a9e36..833d86b13 100644
--- a/drivers/misc/mediatek/masp/asfv2/module/sec_mod.c
+++ b/drivers/misc/mediatek/masp/asfv2/module/sec_mod.c
@@ -23,7 +23,7 @@
#include <linux/unistd.h>
#include <linux/sched.h>
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/version.h>
#include <linux/spinlock.h>
#include <linux/semaphore.h>
diff --git a/drivers/misc/mediatek/masp/mt6735/module/sec_mod.c b/drivers/misc/mediatek/masp/mt6735/module/sec_mod.c
index 134e0a786..7cf9fa73b 100644
--- a/drivers/misc/mediatek/masp/mt6735/module/sec_mod.c
+++ b/drivers/misc/mediatek/masp/mt6735/module/sec_mod.c
@@ -23,7 +23,7 @@
#include <linux/unistd.h>
#include <linux/sched.h>
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/version.h>
#include <linux/spinlock.h>
#include <linux/semaphore.h>
diff --git a/drivers/misc/mediatek/mjc/mt6735/mjc_kernel_driver.c b/drivers/misc/mediatek/mjc/mt6735/mjc_kernel_driver.c
index 476df0ce8..8f4c5fbd6 100644
--- a/drivers/misc/mediatek/mjc/mt6735/mjc_kernel_driver.c
+++ b/drivers/misc/mediatek/mjc/mt6735/mjc_kernel_driver.c
@@ -9,7 +9,7 @@
#include <linux/xlog.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/earlysuspend.h>
diff --git a/drivers/misc/mediatek/mlog/mlog_logger.c b/drivers/misc/mediatek/mlog/mlog_logger.c
index 4fea58343..24a4333cd 100644
--- a/drivers/misc/mediatek/mlog/mlog_logger.c
+++ b/drivers/misc/mediatek/mlog/mlog_logger.c
@@ -13,7 +13,7 @@
#include <linux/cred.h>
#include <linux/rcupdate.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/version.h>
#define COLLECT_GPU_MEMINFO
diff --git a/drivers/misc/mediatek/mmc-host/emmc_rpmb.c b/drivers/misc/mediatek/mmc-host/emmc_rpmb.c
index 229ea8e51..a14623def 100644
--- a/drivers/misc/mediatek/mmc-host/emmc_rpmb.c
+++ b/drivers/misc/mediatek/mmc-host/emmc_rpmb.c
@@ -7,7 +7,7 @@
#include <linux/unistd.h>
#include <linux/sched.h>
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/version.h>
#include <linux/spinlock.h>
#include <linux/semaphore.h>
diff --git a/drivers/misc/mediatek/mmc-host/mt6735/emmc_otp.c b/drivers/misc/mediatek/mmc-host/mt6735/emmc_otp.c
index 264e39722..c36413573 100644
--- a/drivers/misc/mediatek/mmc-host/mt6735/emmc_otp.c
+++ b/drivers/misc/mediatek/mmc-host/mt6735/emmc_otp.c
@@ -21,7 +21,7 @@
#include <linux/proc_fs.h>
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mt_sd.h"
#include "emmc_otp.h"
diff --git a/drivers/misc/mediatek/mmc-host/mt6735/mt_sd_misc.c b/drivers/misc/mediatek/mmc-host/mt6735/mt_sd_misc.c
index c388eaa1c..bfea1eca4 100644
--- a/drivers/misc/mediatek/mmc-host/mt6735/mt_sd_misc.c
+++ b/drivers/misc/mediatek/mmc-host/mt6735/mt_sd_misc.c
@@ -34,7 +34,7 @@
#include <linux/proc_fs.h>
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef CONFIG_MTK_EMMC_SUPPORT
/* extern struct excel_info PartInfoEmmc[PART_NUM]; */
diff --git a/drivers/misc/mediatek/mmp/dummy/mmprofile.c b/drivers/misc/mediatek/mmp/dummy/mmprofile.c
index effe60d1c..0115b0bf5 100644
--- a/drivers/misc/mediatek/mmp/dummy/mmprofile.c
+++ b/drivers/misc/mediatek/mmp/dummy/mmprofile.c
@@ -10,7 +10,7 @@
#include <linux/device.h>
#include <linux/platform_device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
//#include <asm/mach-types.h>
#define MMPROFILE_INTERNAL
diff --git a/drivers/misc/mediatek/mtprof/auto_tune.c b/drivers/misc/mediatek/mtprof/auto_tune.c
index d87c4c981..40e138e8f 100644
--- a/drivers/misc/mediatek/mtprof/auto_tune.c
+++ b/drivers/misc/mediatek/mtprof/auto_tune.c
@@ -3,7 +3,7 @@
#include <linux/seq_file.h>
#include <linux/kallsyms.h>
#include <linux/utsname.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/stacktrace.h>
#include <asm/stacktrace.h>
diff --git a/drivers/misc/mediatek/mtprof/bootprof.c b/drivers/misc/mediatek/mtprof/bootprof.c
index 81391131c..98ad13648 100644
--- a/drivers/misc/mediatek/mtprof/bootprof.c
+++ b/drivers/misc/mediatek/mtprof/bootprof.c
@@ -5,7 +5,7 @@
#include <linux/utsname.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define SEQ_printf(m, x...) \
do { \
diff --git a/drivers/misc/mediatek/mtprof/lockprof.c b/drivers/misc/mediatek/mtprof/lockprof.c
index 40dce891a..51d3e5eb2 100644
--- a/drivers/misc/mediatek/mtprof/lockprof.c
+++ b/drivers/misc/mediatek/mtprof/lockprof.c
@@ -3,7 +3,7 @@
#include <linux/seq_file.h>
#include <linux/kallsyms.h>
#include <linux/utsname.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/stacktrace.h>
#include <asm/stacktrace.h>
diff --git a/drivers/misc/mediatek/mtprof/monitor_debug_out.c b/drivers/misc/mediatek/mtprof/monitor_debug_out.c
index 1a1783349..af6821b83 100644
--- a/drivers/misc/mediatek/mtprof/monitor_debug_out.c
+++ b/drivers/misc/mediatek/mtprof/monitor_debug_out.c
@@ -3,7 +3,7 @@
#include <linux/seq_file.h>
#include <linux/kallsyms.h>
#include <linux/utsname.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "prof_ctl.h"
#include <linux/module.h>
#include <linux/pid.h>
diff --git a/drivers/misc/mediatek/mtprof/mt_debug_config.c b/drivers/misc/mediatek/mtprof/mt_debug_config.c
index e643428e0..2280336b1 100644
--- a/drivers/misc/mediatek/mtprof/mt_debug_config.c
+++ b/drivers/misc/mediatek/mtprof/mt_debug_config.c
@@ -3,7 +3,7 @@
#include <linux/seq_file.h>
#include <linux/kallsyms.h>
#include <linux/utsname.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "prof_ctl.h"
#include <linux/module.h>
#include <linux/pid.h>
diff --git a/drivers/misc/mediatek/mtprof/mt_printk_ctrl.c b/drivers/misc/mediatek/mtprof/mt_printk_ctrl.c
index 086be7480..8e14e524c 100644
--- a/drivers/misc/mediatek/mtprof/mt_printk_ctrl.c
+++ b/drivers/misc/mediatek/mtprof/mt_printk_ctrl.c
@@ -3,7 +3,7 @@
#include <linux/seq_file.h>
#include <linux/kallsyms.h>
#include <linux/utsname.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "prof_ctl.h"
#include <linux/module.h>
#include <linux/pid.h>
diff --git a/drivers/misc/mediatek/mtprof/mt_prv_lock.c b/drivers/misc/mediatek/mtprof/mt_prv_lock.c
index 04f5322d1..4a49cd37d 100644
--- a/drivers/misc/mediatek/mtprof/mt_prv_lock.c
+++ b/drivers/misc/mediatek/mtprof/mt_prv_lock.c
@@ -3,7 +3,7 @@
#include <linux/seq_file.h>
#include <linux/kallsyms.h>
#include <linux/utsname.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/stacktrace.h>
#include <asm/stacktrace.h>
diff --git a/drivers/misc/mediatek/mtprof/prof_ctl.c b/drivers/misc/mediatek/mtprof/prof_ctl.c
index eaf49e361..8bf3ddf77 100644
--- a/drivers/misc/mediatek/mtprof/prof_ctl.c
+++ b/drivers/misc/mediatek/mtprof/prof_ctl.c
@@ -6,7 +6,7 @@
#include <linux/utsname.h>
#include <linux/jiffies.h>
#include <linux/kernel_stat.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/tick.h>
#include "prof_main.h"
#include <linux/version.h>
diff --git a/drivers/misc/mediatek/mtprof/prof_main.c b/drivers/misc/mediatek/mtprof/prof_main.c
index db9910d49..b449d9460 100644
--- a/drivers/misc/mediatek/mtprof/prof_main.c
+++ b/drivers/misc/mediatek/mtprof/prof_main.c
@@ -4,7 +4,7 @@
#include <linux/seq_file.h>
#include <linux/kallsyms.h>
#include <linux/utsname.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/sched.h>
#include <linux/mt_wq_debug.h>
#include <linux/xlog.h>
diff --git a/drivers/misc/mediatek/mtprof/sched_monitor.c b/drivers/misc/mediatek/mtprof/sched_monitor.c
index e0b8abee9..9215c051c 100644
--- a/drivers/misc/mediatek/mtprof/sched_monitor.c
+++ b/drivers/misc/mediatek/mtprof/sched_monitor.c
@@ -4,7 +4,7 @@
#include <linux/kallsyms.h>
#include <linux/utsname.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "prof_ctl.h"
#include <linux/module.h>
#include <linux/pid.h>
diff --git a/drivers/misc/mediatek/mu3d/drv/musb_core.c b/drivers/misc/mediatek/mu3d/drv/musb_core.c
index fb0f87355..dc6b42c3c 100644
--- a/drivers/misc/mediatek/mu3d/drv/musb_core.c
+++ b/drivers/misc/mediatek/mu3d/drv/musb_core.c
@@ -102,7 +102,7 @@
#ifdef CONFIG_USBIF_COMPLIANCE
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/seq_file.h>
#include <mach/system.h>
#endif
diff --git a/drivers/misc/mediatek/mu3d/drv/musb_debugfs.c b/drivers/misc/mediatek/mu3d/drv/musb_debugfs.c
index 40894e4bf..16a28e917 100644
--- a/drivers/misc/mediatek/mu3d/drv/musb_debugfs.c
+++ b/drivers/misc/mediatek/mu3d/drv/musb_debugfs.c
@@ -37,7 +37,7 @@
#include <linux/debugfs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "musb_core.h"
#include "musb_debug.h"
diff --git a/drivers/misc/mediatek/mu3d/test_drv/mu3d_test_test.c b/drivers/misc/mediatek/mu3d/test_drv/mu3d_test_test.c
index b1d737f38..cee03d126 100644
--- a/drivers/misc/mediatek/mu3d/test_drv/mu3d_test_test.c
+++ b/drivers/misc/mediatek/mu3d/test_drv/mu3d_test_test.c
@@ -19,7 +19,7 @@
#include <linux/scatterlist.h>
#include <asm/unaligned.h>
#include <linux/usb/ch9.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/mu3d/test_drv/mu3d_test_test.h>
#include <linux/mu3d/test_drv/mu3d_test_unified.h>
diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193.h b/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193.h
index 584b343ae..f7aeaeee7 100644
--- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193.h
+++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193.h
@@ -15,7 +15,7 @@
#include <linux/rtpm_prio.h>
#include <linux/vmalloc.h>
#include <linux/disp_assert_layer.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <asm/cacheflush.h>
#include <asm/io.h>
diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_gpio.h b/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_gpio.h
index 6fb490290..62f88a345 100644
--- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_gpio.h
+++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_gpio.h
@@ -15,7 +15,7 @@
#include <linux/vmalloc.h>
#include <linux/disp_assert_layer.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <asm/cacheflush.h>
#include <asm/io.h>
diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_pinmux.h b/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_pinmux.h
index 8a77666e5..8651abe17 100644
--- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_pinmux.h
+++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/inc/mt8193_pinmux.h
@@ -16,7 +16,7 @@
#include <linux/vmalloc.h>
#include <linux/disp_assert_layer.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <asm/cacheflush.h>
#include <asm/io.h>
diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_ckgen.c b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_ckgen.c
index 227860e44..68055c9c7 100644
--- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_ckgen.c
+++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_ckgen.c
@@ -15,7 +15,7 @@
#include <linux/platform_device.h>
#include <linux/earlysuspend.h>
#include <linux/cdev.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_gpio.h>
#include <linux/delay.h>
diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_gpio.c b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_gpio.c
index e0580c74f..62b76f968 100644
--- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_gpio.c
+++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_gpio.c
@@ -16,7 +16,7 @@
#include <linux/vmalloc.h>
#include <linux/disp_assert_layer.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <asm/cacheflush.h>
#include <asm/io.h>
@@ -33,7 +33,7 @@
#include <asm/tlbflush.h>
#include <asm/page.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/slab.h>
#include <generated/autoconf.h>
@@ -49,7 +49,7 @@
#include <linux/kthread.h>
#include <linux/rtpm_prio.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <asm/cacheflush.h>
#include <asm/io.h>
@@ -58,7 +58,7 @@
#include <mach/irqs.h>
#include <linux/vmalloc.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mt8193_pinmux.h"
#include "mt8193_gpio.h"
diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_iic.c b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_iic.c
index 93d87928d..68648426c 100644
--- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_iic.c
+++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_iic.c
@@ -34,7 +34,7 @@
#include <linux/vmalloc.h>
#include <linux/disp_assert_layer.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <asm/cacheflush.h>
#include <asm/io.h>
@@ -51,7 +51,7 @@
#include <asm/tlbflush.h>
#include <asm/page.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/slab.h>
#include <generated/autoconf.h>
@@ -67,7 +67,7 @@
#include <linux/kthread.h>
#include <linux/rtpm_prio.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <asm/cacheflush.h>
#include <asm/io.h>
@@ -76,7 +76,7 @@
#include <mach/irqs.h>
#include <linux/vmalloc.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mt8193_iic.h"
#include "cust_mt8193.h"
diff --git a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_pinmux.c b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_pinmux.c
index 01e417ade..316bc9c1c 100644
--- a/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_pinmux.c
+++ b/drivers/misc/mediatek/multibridge/mt6735/mt8193/mt8193_pinmux.c
@@ -16,7 +16,7 @@
#include <linux/vmalloc.h>
#include <linux/disp_assert_layer.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <asm/cacheflush.h>
#include <asm/io.h>
@@ -33,7 +33,7 @@
#include <asm/tlbflush.h>
#include <asm/page.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/slab.h>
#include <generated/autoconf.h>
@@ -49,7 +49,7 @@
#include <linux/kthread.h>
#include <linux/rtpm_prio.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <asm/cacheflush.h>
#include <asm/io.h>
@@ -58,7 +58,7 @@
#include <mach/irqs.h>
#include <linux/vmalloc.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mt8193_pinmux.h"
#include "mt8193.h"
diff --git a/drivers/misc/mediatek/nand/mt6735/mtk_nand.c b/drivers/misc/mediatek/nand/mt6735/mtk_nand.c
index fa5996bb0..fc7f65b0d 100644
--- a/drivers/misc/mediatek/nand/mt6735/mtk_nand.c
+++ b/drivers/misc/mediatek/nand/mt6735/mtk_nand.c
@@ -34,7 +34,7 @@
#include <linux/mm.h>
#include <asm/io.h>
#include <asm/cacheflush.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/miscdevice.h>
#include <mach/mtk_nand.h>
#include <mach/dma.h>
diff --git a/drivers/misc/mediatek/nand/mt6735/partition_mt.c b/drivers/misc/mediatek/nand/mt6735/partition_mt.c
index 2657c5f3f..6f21b0a75 100644
--- a/drivers/misc/mediatek/nand/mt6735/partition_mt.c
+++ b/drivers/misc/mediatek/nand/mt6735/partition_mt.c
@@ -33,7 +33,7 @@
#include <asm/io.h>
#include <asm/cacheflush.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_typedefs.h>
#include <mach/mt_clkmgr.h>
diff --git a/drivers/misc/mediatek/pa/pa.c b/drivers/misc/mediatek/pa/pa.c
index beb3c2fb0..f3b5c9ddc 100644
--- a/drivers/misc/mediatek/pa/pa.c
+++ b/drivers/misc/mediatek/pa/pa.c
@@ -9,7 +9,7 @@
#include <linux/sysfs.h>
#include <linux/device.h>
#include <linux/platform_device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/cputime.h>
#include <linux/tick.h>
#include <linux/kernel_stat.h>
diff --git a/drivers/misc/mediatek/pa_hmp/pa.c b/drivers/misc/mediatek/pa_hmp/pa.c
index 0c2052cf5..7bb055bdd 100644
--- a/drivers/misc/mediatek/pa_hmp/pa.c
+++ b/drivers/misc/mediatek/pa_hmp/pa.c
@@ -9,7 +9,7 @@
#include <linux/sysfs.h>
#include <linux/device.h>
#include <linux/platform_device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/cputime.h>
#include <linux/tick.h>
#include <linux/kernel_stat.h>
diff --git a/drivers/misc/mediatek/partition/mt6735/efi.c b/drivers/misc/mediatek/partition/mt6735/efi.c
index fabec3489..b589c1466 100644
--- a/drivers/misc/mediatek/partition/mt6735/efi.c
+++ b/drivers/misc/mediatek/partition/mt6735/efi.c
@@ -3,7 +3,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/crc32.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/mmc/sd_misc.h>
diff --git a/drivers/misc/mediatek/partition/mt6735/partition.c b/drivers/misc/mediatek/partition/mt6735/partition.c
index 2f99b44c1..d43ed3969 100644
--- a/drivers/misc/mediatek/partition/mt6735/partition.c
+++ b/drivers/misc/mediatek/partition/mt6735/partition.c
@@ -2,7 +2,7 @@
#include <linux/genhd.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/mmc/sd_misc.h>
diff --git a/drivers/misc/mediatek/power-loss-test/mt6735/power_loss_test.c b/drivers/misc/mediatek/power-loss-test/mt6735/power_loss_test.c
index 934f5220b..63d611f44 100644
--- a/drivers/misc/mediatek/power-loss-test/mt6735/power_loss_test.c
+++ b/drivers/misc/mediatek/power-loss-test/mt6735/power_loss_test.c
@@ -8,7 +8,7 @@
#include <linux/device.h>
#include <linux/cdev.h>
#include <asm/processor.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h> //Add for msleep
#include <linux/seq_file.h>
#include <mach/wd_api.h>
diff --git a/drivers/misc/mediatek/power/mt6735/bq24261.c b/drivers/misc/mediatek/power/mt6735/bq24261.c
index d74f204f3..7c9b7ab21 100644
--- a/drivers/misc/mediatek/power/mt6735/bq24261.c
+++ b/drivers/misc/mediatek/power/mt6735/bq24261.c
@@ -3,7 +3,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/power/mt6735/bq24296.c b/drivers/misc/mediatek/power/mt6735/bq24296.c
index 7e19890b4..3062a9450 100644
--- a/drivers/misc/mediatek/power/mt6735/bq24296.c
+++ b/drivers/misc/mediatek/power/mt6735/bq24296.c
@@ -3,7 +3,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/power/mt6735/fan5405.c b/drivers/misc/mediatek/power/mt6735/fan5405.c
index 1ee31d819..3f25308c5 100644
--- a/drivers/misc/mediatek/power/mt6735/fan5405.c
+++ b/drivers/misc/mediatek/power/mt6735/fan5405.c
@@ -3,7 +3,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/power/mt6735/max77819_pmic.c b/drivers/misc/mediatek/power/mt6735/max77819_pmic.c
index 04622d594..ae201ac90 100644
--- a/drivers/misc/mediatek/power/mt6735/max77819_pmic.c
+++ b/drivers/misc/mediatek/power/mt6735/max77819_pmic.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/power/mt6735/mt6311.c b/drivers/misc/mediatek/power/mt6735/mt6311.c
index e0af604f0..fc5e22723 100644
--- a/drivers/misc/mediatek/power/mt6735/mt6311.c
+++ b/drivers/misc/mediatek/power/mt6735/mt6311.c
@@ -16,7 +16,7 @@
#include <linux/kthread.h>
#include <linux/wakelock.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/misc/mediatek/power/mt6735/ncp1854.c b/drivers/misc/mediatek/power/mt6735/ncp1854.c
index 333e8609c..d7938d99e 100644
--- a/drivers/misc/mediatek/power/mt6735/ncp1854.c
+++ b/drivers/misc/mediatek/power/mt6735/ncp1854.c
@@ -3,7 +3,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/power/mt6735/pmic.c b/drivers/misc/mediatek/power/mt6735/pmic.c
index f6ea19c79..efdeac0f3 100644
--- a/drivers/misc/mediatek/power/mt6735/pmic.c
+++ b/drivers/misc/mediatek/power/mt6735/pmic.c
@@ -46,7 +46,7 @@
#include <linux/of_fdt.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/regulator/driver.h>
#include <linux/regulator/machine.h>
diff --git a/drivers/misc/mediatek/power/mt6735/pmic_auxadc.c b/drivers/misc/mediatek/power/mt6735/pmic_auxadc.c
index 4b60f17db..125868cfb 100644
--- a/drivers/misc/mediatek/power/mt6735/pmic_auxadc.c
+++ b/drivers/misc/mediatek/power/mt6735/pmic_auxadc.c
@@ -25,7 +25,7 @@
#include <linux/earlysuspend.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/upmu_common.h>
#include <mach/upmu_sw.h>
diff --git a/drivers/misc/mediatek/power/mt6735/pmic_chr_type_det.c b/drivers/misc/mediatek/power/mt6735/pmic_chr_type_det.c
index 165022068..44c41af17 100644
--- a/drivers/misc/mediatek/power/mt6735/pmic_chr_type_det.c
+++ b/drivers/misc/mediatek/power/mt6735/pmic_chr_type_det.c
@@ -25,7 +25,7 @@
#include <linux/earlysuspend.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/upmu_common.h>
#include <mach/upmu_sw.h>
diff --git a/drivers/misc/mediatek/power/mt6735/pmic_dvt.c b/drivers/misc/mediatek/power/mt6735/pmic_dvt.c
index 0c0a7babc..cda169490 100644
--- a/drivers/misc/mediatek/power/mt6735/pmic_dvt.c
+++ b/drivers/misc/mediatek/power/mt6735/pmic_dvt.c
@@ -26,7 +26,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/upmu_common.h>
#include <mach/upmu_sw.h>
diff --git a/drivers/misc/mediatek/power/mt6735/pmic_otg_type_det.c b/drivers/misc/mediatek/power/mt6735/pmic_otg_type_det.c
index 4c32ba907..41082dbcd 100644
--- a/drivers/misc/mediatek/power/mt6735/pmic_otg_type_det.c
+++ b/drivers/misc/mediatek/power/mt6735/pmic_otg_type_det.c
@@ -25,7 +25,7 @@
#include <linux/earlysuspend.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/upmu_common.h>
#include <mach/upmu_sw.h>
diff --git a/drivers/misc/mediatek/power/mt6735/tps6128x.c b/drivers/misc/mediatek/power/mt6735/tps6128x.c
index 726608217..3824fa9b6 100644
--- a/drivers/misc/mediatek/power/mt6735/tps6128x.c
+++ b/drivers/misc/mediatek/power/mt6735/tps6128x.c
@@ -3,7 +3,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/pwm/mt6735/mt_pwm_hal.c b/drivers/misc/mediatek/pwm/mt6735/mt_pwm_hal.c
index c47f58f41..c10cfb1c7 100644
--- a/drivers/misc/mediatek/pwm/mt6735/mt_pwm_hal.c
+++ b/drivers/misc/mediatek/pwm/mt6735/mt_pwm_hal.c
@@ -23,7 +23,7 @@
#include <linux/types.h>
#include <linux/delay.h>
#include <asm/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <mach/mt_pwm_hal_pub.h>
diff --git a/drivers/misc/mediatek/pwm/mt_pwm.c b/drivers/misc/mediatek/pwm/mt_pwm.c
index 99d4abfd3..3d51ae5ed 100644
--- a/drivers/misc/mediatek/pwm/mt_pwm.c
+++ b/drivers/misc/mediatek/pwm/mt_pwm.c
@@ -34,7 +34,7 @@
#include <linux/cdev.h>
#include <linux/miscdevice.h>
#include <asm/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#ifdef CONFIG_OF
#include <linux/of.h>
diff --git a/drivers/misc/mediatek/secmem/mt6735/secmem.c b/drivers/misc/mediatek/secmem/mt6735/secmem.c
index ab31c793f..51b9aa685 100644
--- a/drivers/misc/mediatek/secmem/mt6735/secmem.c
+++ b/drivers/misc/mediatek/secmem/mt6735/secmem.c
@@ -7,7 +7,7 @@
#include <linux/unistd.h>
#include <linux/sched.h>
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/version.h>
#include <linux/spinlock.h>
#include <linux/semaphore.h>
diff --git a/drivers/misc/mediatek/secwidevine/classicdrm/secwidevine.c b/drivers/misc/mediatek/secwidevine/classicdrm/secwidevine.c
index b840304d9..cb1221e3e 100644
--- a/drivers/misc/mediatek/secwidevine/classicdrm/secwidevine.c
+++ b/drivers/misc/mediatek/secwidevine/classicdrm/secwidevine.c
@@ -7,7 +7,7 @@
#include <linux/unistd.h>
#include <linux/sched.h>
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/version.h>
#include <linux/spinlock.h>
#include <linux/semaphore.h>
diff --git a/drivers/misc/mediatek/sensorHub/CwMcuSensor/CwMcuSensor_factory.c b/drivers/misc/mediatek/sensorHub/CwMcuSensor/CwMcuSensor_factory.c
index 4e7cf21c4..841478254 100644
--- a/drivers/misc/mediatek/sensorHub/CwMcuSensor/CwMcuSensor_factory.c
+++ b/drivers/misc/mediatek/sensorHub/CwMcuSensor/CwMcuSensor_factory.c
@@ -3,7 +3,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/sensorHub/SCP_sensorHub/SCP_sensorHub.c b/drivers/misc/mediatek/sensorHub/SCP_sensorHub/SCP_sensorHub.c
index 3ef1c786f..91ac290af 100644
--- a/drivers/misc/mediatek/sensorHub/SCP_sensorHub/SCP_sensorHub.c
+++ b/drivers/misc/mediatek/sensorHub/SCP_sensorHub/SCP_sensorHub.c
@@ -11,7 +11,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/workqueue.h>
diff --git a/drivers/misc/mediatek/sensorHub/SCP_shf/shf_kernel.c b/drivers/misc/mediatek/sensorHub/SCP_shf/shf_kernel.c
index 66c9b176f..af09897d2 100644
--- a/drivers/misc/mediatek/sensorHub/SCP_shf/shf_kernel.c
+++ b/drivers/misc/mediatek/sensorHub/SCP_shf/shf_kernel.c
@@ -1,5 +1,5 @@
#include <asm/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <cust_acc.h>
diff --git a/drivers/misc/mediatek/ssw/inc/ssw.h b/drivers/misc/mediatek/ssw/inc/ssw.h
index 07bb1e7aa..17ec0a617 100644
--- a/drivers/misc/mediatek/ssw/inc/ssw.h
+++ b/drivers/misc/mediatek/ssw/inc/ssw.h
@@ -13,7 +13,7 @@
#include <linux/ctype.h>
#include <linux/cdev.h>
#include <linux/string.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/misc/mediatek/sysenv/mt6735/sysenv.c b/drivers/misc/mediatek/sysenv/mt6735/sysenv.c
index 083270101..66be68438 100644
--- a/drivers/misc/mediatek/sysenv/mt6735/sysenv.c
+++ b/drivers/misc/mediatek/sysenv/mt6735/sysenv.c
@@ -6,7 +6,7 @@
#include <linux/proc_fs.h> /*proc_create API*/
#include <linux/statfs.h> /* kstatfs struct */
#include <linux/file.h> /*kernel write and kernel read*/
-#include <asm/uaccess.h> /*copy_to_user copy_from_user */
+#include <linux/uaccess.h> /*copy_to_user copy_from_user */
#include <mach/env.h>
static char env_get_char(int index);
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amddulthro.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amddulthro.c
index b27329601..c5e51439c 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amddulthro.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amddulthro.c
@@ -4,7 +4,7 @@
#include <linux/types.h>
#include <linux/kobject.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/err.h>
#include <linux/syscalls.h>
#include <linux/timer.h>
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amdtxctrl.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amdtxctrl.c
index 4f7b628a7..dfe91ddc5 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amdtxctrl.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amdtxctrl.c
@@ -3,7 +3,7 @@
#include <linux/types.h>
#include <linux/kobject.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/err.h>
#include <linux/syscalls.h>
#include <linux/timer.h>
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amutt.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amutt.c
index b6967f716..67f14c97c 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amutt.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_amutt.c
@@ -4,7 +4,7 @@
#include <linux/types.h>
#include <linux/kobject.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/err.h>
#include <linux/syscalls.h>
#include <linux/timer.h>
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_bcct.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_bcct.c
index 487abdaf6..43d35d067 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_bcct.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_bcct.c
@@ -5,7 +5,7 @@
#include <linux/kobject.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/err.h>
#include <linux/syscalls.h>
#include "mach/mtk_thermal_monitor.h"
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddtxpwr.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddtxpwr.c
index 1727cddc4..d415fb664 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddtxpwr.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddtxpwr.c
@@ -3,7 +3,7 @@
#include <linux/types.h>
#include <linux/kobject.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/err.h>
#include <linux/syscalls.h>
#include "mach/mtk_thermal_monitor.h"
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddulthro.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddulthro.c
index 88ced86a4..5a613a615 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddulthro.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mddulthro.c
@@ -3,7 +3,7 @@
#include <linux/types.h>
#include <linux/kobject.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/err.h>
#include <linux/syscalls.h>
#include "mach/mtk_thermal_monitor.h"
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdtxpwr.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdtxpwr.c
index cdd15cc0b..62e288cc5 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdtxpwr.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdtxpwr.c
@@ -3,7 +3,7 @@
#include <linux/types.h>
#include <linux/kobject.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/err.h>
#include <linux/syscalls.h>
#include "mach/mtk_thermal_monitor.h"
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdulthro.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdulthro.c
index fbfe3d9a3..d4fa8b46d 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdulthro.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mdulthro.c
@@ -3,7 +3,7 @@
#include <linux/types.h>
#include <linux/kobject.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/err.h>
#include <linux/syscalls.h>
#include <linux/timer.h>
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mutt.c b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mutt.c
index 4eae0d7dd..e9447bfb7 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mutt.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_cooler_mutt.c
@@ -4,7 +4,7 @@
#include <linux/types.h>
#include <linux/kobject.h>
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/err.h>
#include <linux/syscalls.h>
#include "mach/mtk_thermal_monitor.h"
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_dummy.c b/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_dummy.c
index fd28b02eb..93174bd9c 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_dummy.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_dummy.c
@@ -1,4 +1,4 @@
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
//#include <asm/system.h>
#include <linux/kernel.h>
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_platform.c b/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_platform.c
index 8ce3769a4..6fb9e03c8 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_platform.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_thermal_platform.c
@@ -1,4 +1,4 @@
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/dmi.h>
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_battery.c b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_battery.c
index 2de2e84bc..edba9bd80 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_battery.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_battery.c
@@ -12,7 +12,7 @@
#include <linux/syscalls.h>
#include <linux/sched.h>
#include <linux/writeback.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mach/mtk_thermal_monitor.h"
#include "mach/mt_typedefs.h"
#include "mach/mt_thermal.h"
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_bts.c b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_bts.c
index d464f2080..e6388fabb 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_bts.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_bts.c
@@ -12,7 +12,7 @@
#include <linux/syscalls.h>
#include <linux/sched.h>
#include <linux/writeback.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mach/mtk_thermal_monitor.h"
#include "mach/mt_typedefs.h"
#include "mach/mt_thermal.h"
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_btsmdpa.c b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_btsmdpa.c
index 941db2635..8d3012b56 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_btsmdpa.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_btsmdpa.c
@@ -12,7 +12,7 @@
#include <linux/syscalls.h>
#include <linux/sched.h>
#include <linux/writeback.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mach/mtk_thermal_monitor.h"
#include "mach/mt_typedefs.h"
#include "mach/mt_thermal.h"
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa.c b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa.c
index ba769a4af..f39a2973d 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa.c
@@ -12,7 +12,7 @@
#include <linux/syscalls.h>
#include <linux/sched.h>
#include <linux/writeback.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/string.h>
#include <linux/spinlock.h>
#include "mach/mtk_thermal_monitor.h"
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa_thput.c b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa_thput.c
index 6ea5393ef..96a4087e0 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa_thput.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_pa_thput.c
@@ -13,7 +13,7 @@
#include <linux/syscalls.h>
#include <linux/sched.h>
#include <linux/writeback.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/string.h>
#include <linux/spinlock.h>
#include "mach/mtk_thermal_monitor.h"
diff --git a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_wmt.c b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_wmt.c
index bc9f20a5b..d61298545 100644
--- a/drivers/misc/mediatek/thermal/mt6735/mtk_ts_wmt.c
+++ b/drivers/misc/mediatek/thermal/mt6735/mtk_ts_wmt.c
@@ -2,7 +2,7 @@
#include <linux/thermal.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
//#include "wmt_tm.h"
#include <mach/mtk_thermal_monitor.h>
#include <linux/timer.h>
diff --git a/drivers/misc/mediatek/thermal/mt6735/tm_nth.c b/drivers/misc/mediatek/thermal/mt6735/tm_nth.c
index d9fa1e3a9..cc4f3b3af 100644
--- a/drivers/misc/mediatek/thermal/mt6735/tm_nth.c
+++ b/drivers/misc/mediatek/thermal/mt6735/tm_nth.c
@@ -5,7 +5,7 @@
#include <linux/kobject.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/err.h>
#include <linux/syscalls.h>
#include "mach/mt_thermal.h"
diff --git a/drivers/misc/mediatek/thermal/mtk_cooler_cam.c b/drivers/misc/mediatek/thermal/mtk_cooler_cam.c
index f51c42beb..f7833bb75 100644
--- a/drivers/misc/mediatek/thermal/mtk_cooler_cam.c
+++ b/drivers/misc/mediatek/thermal/mtk_cooler_cam.c
@@ -13,7 +13,7 @@
#include <linux/kobject.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mach/mtk_thermal_monitor.h"
diff --git a/drivers/misc/mediatek/thermal/mtk_cooler_shutdown.c b/drivers/misc/mediatek/thermal/mtk_cooler_shutdown.c
index 0a3a474a8..caff4e4ab 100644
--- a/drivers/misc/mediatek/thermal/mtk_cooler_shutdown.c
+++ b/drivers/misc/mediatek/thermal/mtk_cooler_shutdown.c
@@ -20,7 +20,7 @@
#include <linux/version.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/pid.h>
#include <linux/signal.h>
#include <linux/sched.h>
diff --git a/drivers/misc/mediatek/thermal/mtk_cooler_vrt.c b/drivers/misc/mediatek/thermal/mtk_cooler_vrt.c
index 2b055341b..caccf4313 100644
--- a/drivers/misc/mediatek/thermal/mtk_cooler_vrt.c
+++ b/drivers/misc/mediatek/thermal/mtk_cooler_vrt.c
@@ -11,7 +11,7 @@
#include <linux/kobject.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mach/mtk_thermal_monitor.h"
#define MAX_NUM_INSTANCE_MTK_COOLER_VRT 1
diff --git a/drivers/misc/mediatek/thermal/mtk_thermal_monitor.c b/drivers/misc/mediatek/thermal/mtk_thermal_monitor.c
index c0081badf..09462c598 100644
--- a/drivers/misc/mediatek/thermal/mtk_thermal_monitor.c
+++ b/drivers/misc/mediatek/thermal/mtk_thermal_monitor.c
@@ -3,7 +3,7 @@
#endif
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/printk.h>
diff --git a/drivers/misc/mediatek/trustzone/tz_fileio.c b/drivers/misc/mediatek/trustzone/tz_fileio.c
index ea4816961..4e813543f 100644
--- a/drivers/misc/mediatek/trustzone/tz_fileio.c
+++ b/drivers/misc/mediatek/trustzone/tz_fileio.c
@@ -3,7 +3,7 @@
#include <linux/fs.h>
#include <asm/segment.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/buffer_head.h>
#include "tz_fileio.h"
diff --git a/drivers/misc/mediatek/trustzone/tz_fileio.h b/drivers/misc/mediatek/trustzone/tz_fileio.h
index b4d83f4eb..07cd48611 100644
--- a/drivers/misc/mediatek/trustzone/tz_fileio.h
+++ b/drivers/misc/mediatek/trustzone/tz_fileio.h
@@ -2,7 +2,7 @@
#define DRIVER_FILE_PR_IO_H
#include <linux/fs.h>
#include <asm/segment.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/buffer_head.h>
#define UINT64 unsigned long long
#define INT64 long long
diff --git a/drivers/misc/mediatek/uibc/uibc.c b/drivers/misc/mediatek/uibc/uibc.c
index 9f4b28116..a7dea847f 100644
--- a/drivers/misc/mediatek/uibc/uibc.c
+++ b/drivers/misc/mediatek/uibc/uibc.c
@@ -16,7 +16,7 @@
#include <linux/device.h>
#include <linux/errno.h>
#include <asm/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/input/mt.h>
#include <linux/version.h>
#include <linux/slab.h>
diff --git a/drivers/misc/mediatek/usb11/mt6735/musbfsh_debugfs.c b/drivers/misc/mediatek/usb11/mt6735/musbfsh_debugfs.c
index 7f7499ed0..6b16da0a1 100644
--- a/drivers/misc/mediatek/usb11/mt6735/musbfsh_debugfs.c
+++ b/drivers/misc/mediatek/usb11/mt6735/musbfsh_debugfs.c
@@ -36,7 +36,7 @@
#include <linux/debugfs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "musbfsh_core.h"
#include "musbfsh_host.h"
diff --git a/drivers/misc/mediatek/usb20/mt6735/usb20_otg_if.c b/drivers/misc/mediatek/usb20/mt6735/usb20_otg_if.c
index f40861de7..0e7932d66 100644
--- a/drivers/misc/mediatek/usb20/mt6735/usb20_otg_if.c
+++ b/drivers/misc/mediatek/usb20/mt6735/usb20_otg_if.c
@@ -43,7 +43,7 @@
#include <linux/io.h>
//#include <asm/system.h>
#include <linux/miscdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/completion.h>
#include <mach/eint.h>
#include <linux/gpio.h>
diff --git a/drivers/misc/mediatek/usb20/mt6735/usb20_phy_debugfs.c b/drivers/misc/mediatek/usb20/mt6735/usb20_phy_debugfs.c
index bba0fefd0..187ac114c 100644
--- a/drivers/misc/mediatek/usb20/mt6735/usb20_phy_debugfs.c
+++ b/drivers/misc/mediatek/usb20/mt6735/usb20_phy_debugfs.c
@@ -3,7 +3,7 @@
#include <linux/init.h>
#include <linux/debugfs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/musb/musb_core.h>
#include <linux/musb/musb_debug.h>
#include <linux/musb/mtk_musb.h>
diff --git a/drivers/misc/mediatek/usb20/musb_debugfs.c b/drivers/misc/mediatek/usb20/musb_debugfs.c
index a4b5077e1..4baa79d1b 100644
--- a/drivers/misc/mediatek/usb20/musb_debugfs.c
+++ b/drivers/misc/mediatek/usb20/musb_debugfs.c
@@ -37,7 +37,7 @@
#include <linux/debugfs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/musb/musb_core.h>
#include <linux/musb/musb_debug.h>
diff --git a/drivers/misc/mediatek/vdec/vdec.c b/drivers/misc/mediatek/vdec/vdec.c
index ffd5070f6..74539e9d2 100644
--- a/drivers/misc/mediatek/vdec/vdec.c
+++ b/drivers/misc/mediatek/vdec/vdec.c
@@ -12,7 +12,7 @@
#include <linux/cdev.h>
#include <linux/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "verify/vdec_verify_vdec.h"
#include <linux/kthread.h>
#include <linux/sched.h>
diff --git a/drivers/misc/mediatek/vdec/verify/sata_fs_io.c b/drivers/misc/mediatek/vdec/verify/sata_fs_io.c
index 6f47a4b18..9045c03b7 100644
--- a/drivers/misc/mediatek/vdec/verify/sata_fs_io.c
+++ b/drivers/misc/mediatek/vdec/verify/sata_fs_io.c
@@ -16,7 +16,7 @@
#include <linux/kdev_t.h>
#include <linux/cdev.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/sched.h>
#include <linux/file.h>
#include <linux/slab.h>
diff --git a/drivers/misc/mediatek/vdec/verify/usb_io.c b/drivers/misc/mediatek/vdec/verify/usb_io.c
index f6f0b2d6c..a07eb0a70 100644
--- a/drivers/misc/mediatek/vdec/verify/usb_io.c
+++ b/drivers/misc/mediatek/vdec/verify/usb_io.c
@@ -16,7 +16,7 @@
#include <linux/kdev_t.h>
#include <linux/cdev.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/sched.h>
#include <linux/file.h>
#include <linux/slab.h>
diff --git a/drivers/misc/mediatek/vdec/verify/vdec_verify_filesetting.c b/drivers/misc/mediatek/vdec/verify/vdec_verify_filesetting.c
index b048e2dd9..abcbb0596 100644
--- a/drivers/misc/mediatek/vdec/verify/vdec_verify_filesetting.c
+++ b/drivers/misc/mediatek/vdec/verify/vdec_verify_filesetting.c
@@ -6,7 +6,7 @@
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/kernel.h>
//#include "common.h"
diff --git a/drivers/misc/mediatek/vdec/verify/vdec_verify_vdecode.c b/drivers/misc/mediatek/vdec/verify/vdec_verify_vdecode.c
index c4e79887e..e3a0b02d6 100644
--- a/drivers/misc/mediatek/vdec/verify/vdec_verify_vdecode.c
+++ b/drivers/misc/mediatek/vdec/verify/vdec_verify_vdecode.c
@@ -57,7 +57,7 @@
#include <linux/kdev_t.h>
#include <linux/cdev.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/sched.h>
#include <linux/file.h>
#include <linux/slab.h>
diff --git a/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D1.c b/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D1.c
index 0813badb2..a3d95a9d8 100644
--- a/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D1.c
+++ b/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D1.c
@@ -12,7 +12,7 @@
#include <linux/mm.h>
#include <linux/jiffies.h>
#include <linux/sched.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/page.h>
#include <linux/vmalloc.h>
#include <linux/interrupt.h>
diff --git a/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D2.c b/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D2.c
index b78273ab4..7c038074c 100644
--- a/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D2.c
+++ b/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D2.c
@@ -12,7 +12,7 @@
#include <linux/mm.h>
#include <linux/jiffies.h>
#include <linux/sched.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/page.h>
#include <linux/vmalloc.h>
#include <linux/interrupt.h>
diff --git a/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D3.c b/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D3.c
index 7f19f3016..d0f43e2b3 100644
--- a/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D3.c
+++ b/drivers/misc/mediatek/videocodec/mt6735/videocodec_kernel_driver_D3.c
@@ -12,7 +12,7 @@
#include <linux/mm.h>
#include <linux/jiffies.h>
#include <linux/sched.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/page.h>
#include <linux/vmalloc.h>
#include <linux/interrupt.h>
diff --git a/drivers/misc/mediatek/videox/mt6735/mtkfb.c b/drivers/misc/mediatek/videox/mt6735/mtkfb.c
index 2672a30f8..e7e0e6b4d 100644
--- a/drivers/misc/mediatek/videox/mt6735/mtkfb.c
+++ b/drivers/misc/mediatek/videox/mt6735/mtkfb.c
@@ -20,7 +20,7 @@
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/dma-buf.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/atomic.h>
//#include <asm/mach-types.h>
#include <asm/cacheflush.h>
diff --git a/drivers/misc/mediatek/vow/mt6735/vow.c b/drivers/misc/mediatek/vow/mt6735/vow.c
index 3d09f602b..b789ce73b 100644
--- a/drivers/misc/mediatek/vow/mt6735/vow.c
+++ b/drivers/misc/mediatek/vow/mt6735/vow.c
@@ -43,7 +43,7 @@
#include <linux/mm.h>
#include <linux/jiffies.h>
#include <linux/sched.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/page.h>
#include <linux/vmalloc.h>
#include <linux/interrupt.h>
diff --git a/drivers/misc/mediatek/wdk/wdt_test.c b/drivers/misc/mediatek/wdk/wdt_test.c
index 7797f71f9..09315b62e 100644
--- a/drivers/misc/mediatek/wdk/wdt_test.c
+++ b/drivers/misc/mediatek/wdk/wdt_test.c
@@ -33,7 +33,7 @@
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/irqs.h>
#include <mach/mt_reg_base.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/misc/mediatek/wdt/mt6735/mtk_wdt.c b/drivers/misc/mediatek/wdt/mt6735/mtk_wdt.c
index bd2d8166c..c392c3d7d 100644
--- a/drivers/misc/mediatek/wdt/mt6735/mtk_wdt.c
+++ b/drivers/misc/mediatek/wdt/mt6735/mtk_wdt.c
@@ -9,7 +9,7 @@
#include <linux/watchdog.h>
#include <linux/platform_device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/irqs.h>
#include <mach/mt_reg_base.h>
#include <mach/mt_typedefs.h>
diff --git a/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h b/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h
index 70ec83575..95c6e991a 100644
--- a/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h
+++ b/drivers/misc/mediatek/wmt_ccci/wmt_cfg_parser.h
@@ -12,7 +12,7 @@
#include <linux/sched.h>
#include <linux/poll.h>
#include <asm/current.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/wait.h>
#include <linux/time.h>
#include <linux/delay.h>
diff --git a/drivers/misc/mediatek/xhci/xhci-mtk.c b/drivers/misc/mediatek/xhci/xhci-mtk.c
index 126dbf83b..dc7c54f9f 100644
--- a/drivers/misc/mediatek/xhci/xhci-mtk.c
+++ b/drivers/misc/mediatek/xhci/xhci-mtk.c
@@ -5,7 +5,7 @@
#include <linux/kernel.h> /* printk() */
#include <linux/slab.h>
#include <linux/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h>
#include <linux/wakelock.h>
diff --git a/drivers/misc/mediatek/xhci_test/mtk-test.c b/drivers/misc/mediatek/xhci_test/mtk-test.c
index 3230ab54b..e12960594 100644
--- a/drivers/misc/mediatek/xhci_test/mtk-test.c
+++ b/drivers/misc/mediatek/xhci_test/mtk-test.c
@@ -19,7 +19,7 @@
#include <linux/scatterlist.h>
#include <asm/unaligned.h>
#include <linux/usb/ch9.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mtk-test.h"
#include "xhci.h"
#include "mtk-usb-hcd.h"
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 164f68a05..a8e178c5c 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -48,7 +48,7 @@
#include <linux/mmc/ffu.h>
#endif
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "queue.h"
#include <mach/mtk_meminfo.h>
diff --git a/drivers/mmc/host/android-goldfish.c b/drivers/mmc/host/android-goldfish.c
index 7780c1470..35d5f366e 100644
--- a/drivers/mmc/host/android-goldfish.c
+++ b/drivers/mmc/host/android-goldfish.c
@@ -49,7 +49,7 @@
#include <asm/types.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define DRIVER_NAME "goldfish_mmc"
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
index 0c51b988e..698a227d4 100644
--- a/drivers/mtd/devices/pmc551.c
+++ b/drivers/mtd/devices/pmc551.c
@@ -82,7 +82,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/ptrace.h>
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index 5a5cd2ace..9ff8a74c2 100644
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -30,7 +30,7 @@
#include <linux/module.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/ptrace.h>
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index 71e4f6cca..366aa0e6b 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -70,7 +70,7 @@
#include <linux/hdreg.h>
#include <linux/vmalloc.h>
#include <linux/blkpg.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/mtd/ftl.h>
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index 3af351484..5786c8d5e 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -34,7 +34,7 @@
#include <linux/mtd/nftl.h>
#include <linux/mtd/inftl.h>
#include <linux/mtd/nand.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/errno.h>
#include <asm/io.h>
diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c
index 4adc0374f..c0d2a8682 100644
--- a/drivers/mtd/inftlmount.c
+++ b/drivers/mtd/inftlmount.c
@@ -27,7 +27,7 @@
#include <linux/module.h>
#include <asm/errno.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/init.h>
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index d467f3b11..07892409c 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -17,7 +17,7 @@
#include <linux/of_device.h>
#include <linux/slab.h>
#include <asm/prom.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 8588fe6cc..eb1fd3c35 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -32,7 +32,7 @@
#include <linux/hdreg.h>
#include <linux/init.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mtdcore.h"
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index c71987928..56c30cf1a 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -36,7 +36,7 @@
#include <linux/mtd/partitions.h>
#include <linux/mtd/map.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mtdcore.h"
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 689db3435..e24e48c41 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -36,7 +36,7 @@
#define DYNAMIC_CHANGE_MTD_WRITEABLE
#ifdef DYNAMIC_CHANGE_MTD_WRITEABLE //wschen 2011-01-05
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static struct mtd_info *my_mtd = NULL;
int mtd_writeable_proc_write(struct file *file, const char *buffer, unsigned long count, void *data);
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index c5f4ebf4b..783965931 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -25,7 +25,7 @@
#include <linux/module.h>
#include <asm/errno.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/init.h>
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index 10d0dba57..73f9107b2 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -33,7 +33,7 @@
#include <linux/if_arp.h>
#include <linux/slab.h>
#include <net/route.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "ipddp.h" /* Our stuff */
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index f219d38ac..f0716d03d 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -127,7 +127,7 @@
#include <linux/if_eql.h>
#include <linux/pkt_sched.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static int eql_open(struct net_device *dev);
static int eql_close(struct net_device *dev);
diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
index adb4bf5eb..472be431c 100644
--- a/drivers/net/ethernet/3com/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c
@@ -88,7 +88,7 @@
#include <linux/eisa.h>
#include <linux/bitops.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>
diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c
index 94c656f5a..1d6eb6b6e 100644
--- a/drivers/net/ethernet/3com/3c515.c
+++ b/drivers/net/ethernet/3com/3c515.c
@@ -72,7 +72,7 @@ static int max_interrupt_work = 20;
#include <linux/ethtool.h>
#include <linux/bitops.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/dma.h>
diff --git a/drivers/net/ethernet/3com/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c
index 6fc994fa4..bda355dc1 100644
--- a/drivers/net/ethernet/3com/3c574_cs.c
+++ b/drivers/net/ethernet/3com/3c574_cs.c
@@ -93,7 +93,7 @@ earlier 3Com products.
#include <pcmcia/ciscode.h>
#include <pcmcia/ds.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
/*====================================================================*/
diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
index 078480aaa..f285591b6 100644
--- a/drivers/net/ethernet/3com/3c589_cs.c
+++ b/drivers/net/ethernet/3com/3c589_cs.c
@@ -48,7 +48,7 @@
#include <pcmcia/ciscode.h>
#include <pcmcia/ds.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
/* To minimize the size of the driver source I only define operating
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 072c6f14e..c75fbae27 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -92,7 +92,7 @@ static int vortex_debug = 1;
#include <linux/gfp.h>
#include <asm/irq.h> /* For nr_irqs only. */
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* Kernel compatibility defines, some common to David Hinds' PCMCIA package.
This is only in the support-all-kernels source code. */
diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
index 144942f63..5095cf4a2 100644
--- a/drivers/net/ethernet/3com/typhoon.c
+++ b/drivers/net/ethernet/3com/typhoon.c
@@ -119,7 +119,7 @@ static const int multicast_filter_limit = 32;
#include <linux/bitops.h>
#include <asm/processor.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/in6.h>
#include <linux/dma-mapping.h>
#include <linux/firmware.h>
diff --git a/drivers/net/ethernet/8390/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c
index d801c1410..37538157f 100644
--- a/drivers/net/ethernet/8390/axnet_cs.c
+++ b/drivers/net/ethernet/8390/axnet_cs.c
@@ -47,7 +47,7 @@
#include <asm/io.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define AXNET_CMD 0x00
#define AXNET_DATAPORT 0x10 /* NatSemi-defined port window offset. */
diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
index 587a885de..bb2b92190 100644
--- a/drivers/net/ethernet/8390/ne2k-pci.c
+++ b/drivers/net/ethernet/8390/ne2k-pci.c
@@ -56,7 +56,7 @@ static int options[MAX_UNITS];
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "8390.h"
diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c
index 46c5aadac..a82b1cede 100644
--- a/drivers/net/ethernet/8390/pcnet_cs.c
+++ b/drivers/net/ethernet/8390/pcnet_cs.c
@@ -50,7 +50,7 @@
#include <asm/io.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define PCNET_CMD 0x00
#define PCNET_DATAPORT 0x10 /* NatSemi-defined port window offset. */
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index 8b04bfc20..4ff17c30b 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -45,7 +45,7 @@
#include <linux/mm.h>
#include <linux/firmware.h>
#include <asm/processor.h> /* Processor type for cache alignment. */
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
/*
diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c
index b7894f8af..f0bfc56db 100644
--- a/drivers/net/ethernet/alteon/acenic.c
+++ b/drivers/net/ethernet/alteon/acenic.c
@@ -81,7 +81,7 @@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define DRV_NAME "acenic"
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 8e6b665a6..a75b38d32 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -90,7 +90,7 @@ Revision History:
#include <asm/io.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
#define AMD8111E_VLAN_TAG_USED 1
diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c
index d4ed89130..1f775c7f2 100644
--- a/drivers/net/ethernet/amd/nmclan_cs.c
+++ b/drivers/net/ethernet/amd/nmclan_cs.c
@@ -152,7 +152,7 @@ Include Files
#include <pcmcia/cistpl.h>
#include <pcmcia/ds.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
/* ----------------------------------------------------------------------------
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index 9b017d9c5..853399027 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -30,7 +30,7 @@
#include <linux/ssb/ssb.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>
diff --git a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
index 9624cfe7d..a2212a508 100644
--- a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
+++ b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
@@ -46,7 +46,7 @@
#include <linux/mii.h>
#include <linux/sockios.h>
#include <linux/dma-mapping.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "cpl5_cmd.h"
#include "regs.h"
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
index 71497e835..f428602e7 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -50,7 +50,7 @@
#include <linux/stringify.h>
#include <linux/sched.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "common.h"
#include "cxgb3_ioctl.h"
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 3cd397d60..776c4c3b5 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -60,7 +60,7 @@
#include <linux/workqueue.h>
#include <net/neighbour.h>
#include <net/netevent.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "cxgb4.h"
#include "t4_regs.h"
diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c
index eaab73cf2..43725d91a 100644
--- a/drivers/net/ethernet/dec/tulip/de2104x.c
+++ b/drivers/net/ethernet/dec/tulip/de2104x.c
@@ -49,7 +49,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/unaligned.h>
/* These identify the driver base version and may not be removed. */
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index 4c830030f..f7f12ddad 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -472,7 +472,7 @@
#include <asm/dma.h>
#include <asm/byteorder.h>
#include <asm/unaligned.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef CONFIG_PPC_PMAC
#include <asm/machdep.h>
#endif /* CONFIG_PPC_PMAC */
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c
index 831393078..9cfd7c6c4 100644
--- a/drivers/net/ethernet/dec/tulip/dmfe.c
+++ b/drivers/net/ethernet/dec/tulip/dmfe.c
@@ -90,7 +90,7 @@
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/dma.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/irq.h>
#ifdef CONFIG_TULIP_DM910X
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index 1e9443d9f..d63ff54ae 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -31,7 +31,7 @@
#include <linux/mii.h>
#include <linux/crc32.h>
#include <asm/unaligned.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef CONFIG_SPARC
#include <asm/prom.h>
diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
index 93845afe1..2a0f80408 100644
--- a/drivers/net/ethernet/dec/tulip/uli526x.c
+++ b/drivers/net/ethernet/dec/tulip/uli526x.c
@@ -40,7 +40,7 @@
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/dma.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define uw32(reg, val) iowrite32(val, ioaddr + (reg))
#define ur32(reg) ioread32(ioaddr + (reg))
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
index c7b04ecf5..6acca60b7 100644
--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
@@ -129,7 +129,7 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
#include <linux/rtnetlink.h>
#include <linux/crc32.h>
#include <linux/bitops.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/io.h>
#include <asm/irq.h>
diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c
index cdbcd1643..878e1574d 100644
--- a/drivers/net/ethernet/dec/tulip/xircom_cb.c
+++ b/drivers/net/ethernet/dec/tulip/xircom_cb.c
@@ -31,7 +31,7 @@
#include <linux/init.h>
#include <linux/bitops.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#ifdef CONFIG_NET_POLL_CONTROLLER
#include <asm/irq.h>
diff --git a/drivers/net/ethernet/dlink/dl2k.h b/drivers/net/ethernet/dlink/dl2k.h
index 369956570..f182e6755 100644
--- a/drivers/net/ethernet/dlink/dl2k.h
+++ b/drivers/net/ethernet/dlink/dl2k.h
@@ -32,7 +32,7 @@
#include <linux/bitops.h>
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/time.h>
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
index 50d9c6315..7783667fe 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -91,7 +91,7 @@ static char *media[MAX_UNITS];
#include <linux/skbuff.h>
#include <linux/init.h>
#include <linux/bitops.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/io.h>
#include <linux/delay.h>
diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
index c706b7a93..9a5ab8948 100644
--- a/drivers/net/ethernet/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c
@@ -88,7 +88,7 @@ static int full_duplex[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1 };
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/byteorder.h>
/* These identify the driver base version and may not be removed. */
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index edc120094..add5bf84a 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -45,7 +45,7 @@
#include <linux/vmalloc.h>
#include <asm/pgtable.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "fs_enet.h"
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
index 7583a9572..4afdb39a9 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
@@ -41,7 +41,7 @@
#include <asm/pgtable.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "fs_enet.h"
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
index 9ae6cdbca..12c4f00c4 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
@@ -35,7 +35,7 @@
#include <linux/gfp.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef CONFIG_8xx
#include <asm/8xx_immap.h>
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
index 22a02a767..599406768 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
@@ -34,7 +34,7 @@
#include <linux/of_platform.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef CONFIG_8xx
#include <asm/8xx_immap.h>
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
index 18e8ef203..acfaadc39 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
@@ -35,7 +35,7 @@
#include <asm/pgtable.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/mpc5xxx.h>
#include "fs_enet.h"
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 2375a0171..40bf34fd2 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -89,7 +89,7 @@
#include <asm/io.h>
#include <asm/reg.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/module.h>
#include <linux/dma-mapping.h>
#include <linux/crc32.h>
diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
index 04b552cd4..22b794cba 100644
--- a/drivers/net/ethernet/freescale/gianfar.h
+++ b/drivers/net/ethernet/freescale/gianfar.h
@@ -41,7 +41,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/module.h>
#include <linux/crc32.h>
#include <linux/workqueue.h>
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 21cd88124..e8f02ad12 100644
--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -33,7 +33,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/module.h>
#include <linux/crc32.h>
#include <asm/types.h>
diff --git a/drivers/net/ethernet/freescale/gianfar_sysfs.c b/drivers/net/ethernet/freescale/gianfar_sysfs.c
index acb55af7e..51ba1ec08 100644
--- a/drivers/net/ethernet/freescale/gianfar_sysfs.c
+++ b/drivers/net/ethernet/freescale/gianfar_sysfs.c
@@ -31,7 +31,7 @@
#include <linux/mm.h>
#include <linux/device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/module.h>
#include "gianfar.h"
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index e04c59818..a5aa94292 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -35,7 +35,7 @@
#include <linux/of_net.h>
#include <linux/of_platform.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/immap_qe.h>
diff --git a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
index e79aaf9ae..fe9ea921f 100644
--- a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
+++ b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
@@ -33,7 +33,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/types.h>
#include "ucc_geth.h"
diff --git a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
index ef46b58cb..b91efdeff 100644
--- a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
+++ b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
@@ -55,7 +55,7 @@
#include <pcmcia/ciscode.h>
#include <pcmcia/ds.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
/*====================================================================*/
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index d300a0c0e..7ba9b689a 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -45,7 +45,7 @@
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/dma.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/dcr.h>
#include <asm/dcr-regs.h>
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
index 82a967c95..aae838153 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
@@ -29,7 +29,7 @@
/* ethtool support for e1000 */
#include "e1000.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
enum {NETDEV_STATS, E1000_STATS};
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
index dbb7dd2f8..469504a0a 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
@@ -30,7 +30,7 @@
#include "ixgb.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define IXGB_ALL_RAR_ENTRIES 16
diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c
index 7a5e29558..9f8984728 100644
--- a/drivers/net/ethernet/natsemi/natsemi.c
+++ b/drivers/net/ethernet/natsemi/natsemi.c
@@ -51,7 +51,7 @@
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define DRV_NAME "natsemi"
#define DRV_VERSION "2.1"
diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c
index d3b47003a..2e3846c25 100644
--- a/drivers/net/ethernet/natsemi/ns83820.c
+++ b/drivers/net/ethernet/natsemi/ns83820.c
@@ -120,7 +120,7 @@
#include <linux/slab.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define DRV_NAME "ns83820"
diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c
index cac33e5f9..37ab6dc15 100644
--- a/drivers/net/ethernet/packetengines/hamachi.c
+++ b/drivers/net/ethernet/packetengines/hamachi.c
@@ -160,7 +160,7 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
#include <linux/delay.h>
#include <linux/bitops.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/io.h>
#include <asm/unaligned.h>
diff --git a/drivers/net/ethernet/packetengines/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c
index d28593b1f..2bea504ea 100644
--- a/drivers/net/ethernet/packetengines/yellowfin.c
+++ b/drivers/net/ethernet/packetengines/yellowfin.c
@@ -100,7 +100,7 @@ static int gx_fix;
#include <linux/ethtool.h>
#include <linux/crc32.h>
#include <linux/bitops.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/unaligned.h>
#include <asm/io.h>
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 437d4cfd4..a992fedce 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -76,7 +76,7 @@
#include <linux/cache.h>
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* These identify the driver base version and may not be removed. */
static char version[] =
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index 7ed08c32a..7317411ca 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -61,7 +61,7 @@
#include <asm/byteorder.h>
#include <asm/io.h>
#include <asm/pgtable.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/sn/types.h>
#include <asm/sn/ioc3.h>
#include <asm/pci/bridge.h>
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index eb4aea3fe..127a5189e 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -74,7 +74,7 @@
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h> /* User space memory access functions */
+#include <linux/uaccess.h> /* User space memory access functions */
#include "sis900.h"
diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c
index 03b256af7..d32709c67 100644
--- a/drivers/net/ethernet/smsc/epic100.c
+++ b/drivers/net/ethernet/smsc/epic100.c
@@ -86,7 +86,7 @@ static int rx_copybreak;
#include <linux/crc32.h>
#include <linux/bitops.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/byteorder.h>
/* These identify the driver base version and may not be removed. */
diff --git a/drivers/net/ethernet/smsc/smc91c92_cs.c b/drivers/net/ethernet/smsc/smc91c92_cs.c
index 656d2e2eb..002f12573 100644
--- a/drivers/net/ethernet/smsc/smc91c92_cs.c
+++ b/drivers/net/ethernet/smsc/smc91c92_cs.c
@@ -53,7 +53,7 @@
#include <pcmcia/ss.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/*====================================================================*/
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index 4c682a3d0..74608487f 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -101,7 +101,7 @@
#include <linux/atomic.h>
#include <asm/io.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define cas_page_map(x) kmap_atomic((x))
#define cas_page_unmap(x) kunmap_atomic((x))
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 5f3f9d527..abb97f5e1 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -43,7 +43,7 @@
#include <asm/io.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/irq.h>
#ifdef CONFIG_SPARC
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index 436fa9d5a..31a03d87a 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -49,7 +49,7 @@
#include <asm/prom.h>
#include <asm/auxio.h>
#endif
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/pgtable.h>
#include <asm/irq.h>
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index c879969e8..06f3479e6 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -109,7 +109,7 @@ static const int multicast_filter_limit = 32;
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/dmi.h>
/* These identify the driver base version and may not be removed. */
diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c
index bdd20b888..236d6a8f2 100644
--- a/drivers/net/ethernet/xircom/xirc2ps_cs.c
+++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c
@@ -89,7 +89,7 @@
#include <pcmcia/ciscode.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifndef MANFID_COMPAQ
#define MANFID_COMPAQ 0x0138
diff --git a/drivers/net/fddi/skfp/skfddi.c b/drivers/net/fddi/skfp/skfddi.c
index d5bd563ac..c159032a8 100644
--- a/drivers/net/fddi/skfp/skfddi.c
+++ b/drivers/net/fddi/skfp/skfddi.c
@@ -88,7 +88,7 @@ static const char * const boot_msg =
#include <asm/byteorder.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "h/types.h"
#undef ADDR // undo Linux definition
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 1450e33fc..7eaa25eb8 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -13,7 +13,7 @@
*/
#include <linux/module.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/bitops.h>
#include <linux/string.h>
#include <linux/mm.h>
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 484f77ec2..3daafeca1 100644
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -55,7 +55,7 @@
#include <linux/jiffies.h>
#include <linux/random.h>
#include <net/ax25.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* --------------------------------------------------------------------- */
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
index acb636963..82c890ee5 100644
--- a/drivers/net/hamradio/baycom_par.c
+++ b/drivers/net/hamradio/baycom_par.c
@@ -86,7 +86,7 @@
#include <linux/bitops.h>
#include <linux/jiffies.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* --------------------------------------------------------------------- */
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c
index a974727dd..90495bd59 100644
--- a/drivers/net/hamradio/baycom_ser_fdx.c
+++ b/drivers/net/hamradio/baycom_ser_fdx.c
@@ -81,7 +81,7 @@
#include <linux/baycom.h>
#include <linux/jiffies.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>
diff --git a/drivers/net/hamradio/baycom_ser_hdx.c b/drivers/net/hamradio/baycom_ser_hdx.c
index e349d8674..376f77058 100644
--- a/drivers/net/hamradio/baycom_ser_hdx.c
+++ b/drivers/net/hamradio/baycom_ser_hdx.c
@@ -67,7 +67,7 @@
#include <linux/string.h>
#include <linux/init.h>
#include <linux/interrupt.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <linux/hdlcdrv.h>
#include <linux/baycom.h>
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 02de6c891..c7d2b370e 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -69,7 +69,7 @@
#include <linux/if_arp.h>
#include <linux/skbuff.h>
#include <net/sock.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
#include <linux/notifier.h>
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 6636022a1..3568a43b9 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -40,7 +40,7 @@
#include <asm/dma.h>
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <net/ax25.h>
#include "z8530.h"
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
index 5d78c1d08..b7fef00aa 100644
--- a/drivers/net/hamradio/hdlcdrv.c
+++ b/drivers/net/hamradio/hdlcdrv.c
@@ -58,7 +58,7 @@
#include <linux/hdlcdrv.h>
#include <linux/random.h>
#include <net/ax25.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/crc-ccitt.h>
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index 8e01c4570..e62279fc0 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -18,7 +18,7 @@
*/
#include <linux/module.h>
#include <linux/bitops.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/crc16.h>
#include <linux/string.h>
#include <linux/mm.h>
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index bc1d52170..5553f12b0 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -178,7 +178,7 @@
#include <asm/irq.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "z8530.h"
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 82529a265..993670906 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -68,7 +68,7 @@
#include <linux/seq_file.h>
#include <net/net_namespace.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/init.h>
#include <linux/yam.h>
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index fc3b18e59..527f32587 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -47,7 +47,7 @@
#include <asm/byteorder.h>
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define rr_if_busy(dev) netif_queue_stopped(dev)
#define rr_if_running(dev) netif_running(dev)
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index 0d71fa9f0..945368e4f 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -31,7 +31,7 @@
#include <linux/slab.h>
#include <linux/tty.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/delay.h>
#include <linux/mutex.h>
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c
index 7b4833874..d5153c08d 100644
--- a/drivers/net/irda/kingsun-sir.c
+++ b/drivers/net/irda/kingsun-sir.c
@@ -72,7 +72,7 @@
#include <asm/unaligned.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <net/irda/irda.h>
#include <net/irda/wrapper.h>
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index 5f3aeac3f..da9bc72b5 100644
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -124,7 +124,7 @@
#include <asm/unaligned.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <net/irda/irda.h>
#include <net/irda/wrapper.h>
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index 2d4b6a1ab..072c6f4a3 100644
--- a/drivers/net/irda/ksdazzle-sir.c
+++ b/drivers/net/irda/ksdazzle-sir.c
@@ -88,7 +88,7 @@
#include <asm/unaligned.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <net/irda/irda.h>
#include <net/irda/wrapper.h>
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index f07c34099..c3d7df71b 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -56,7 +56,7 @@
#include <asm/unaligned.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <net/irda/irda.h>
#include <net/irda/wrapper.h>
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 5f4758492..f194eae6e 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -46,7 +46,7 @@ MODULE_LICENSE("GPL");
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/byteorder.h>
#include <net/irda/irda.h>
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index fcbf680c3..2fcc7e463 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -41,7 +41,7 @@
#include <linux/in.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <linux/inet.h>
diff --git a/drivers/net/phy/cicada.c b/drivers/net/phy/cicada.c
index db472ffb6..950d6f993 100644
--- a/drivers/net/phy/cicada.c
+++ b/drivers/net/phy/cicada.c
@@ -32,7 +32,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* Cicada Extended Control Register 1 */
#define MII_CIS8201_EXT_CON1 0x17
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index 383e8338a..a0870df3c 100644
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -32,7 +32,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define MII_DM9161_SCR 0x10
#define MII_DM9161_SCR_INIT 0x0610
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index b5ddd5077..9d2e7514f 100644
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -28,7 +28,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
MODULE_DESCRIPTION("ICPlus IP175C/IP101A/IP101G/IC1001 PHY drivers");
MODULE_AUTHOR("Michael Barkowski");
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c
index ff2e45e9c..2c2a6f63a 100644
--- a/drivers/net/phy/lxt.c
+++ b/drivers/net/phy/lxt.c
@@ -32,7 +32,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* The Level one LXT970 is used by many boards */
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index b23f36a5b..2e18a7906 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -36,7 +36,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define MII_MARVELL_PHY_PAGE 22
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index dc9209742..d6e173cba 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -39,7 +39,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/**
* mdiobus_alloc_size - allocate a mii_bus structure
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index db49e0b84..e9e9a3fc6 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -40,7 +40,7 @@
#include <linux/atomic.h>
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/**
* phy_print_status - Convenience function to print out the current phy status
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 3657b4a29..0ac84529b 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -36,7 +36,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
MODULE_DESCRIPTION("PHY library");
MODULE_AUTHOR("Andy Fleming");
diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c
index fe0d0a15d..06f4a5ea2 100644
--- a/drivers/net/phy/qsemi.c
+++ b/drivers/net/phy/qsemi.c
@@ -32,7 +32,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* ------------------------------------------------------------------------- */
/* The Quality Semiconductor QS6612 is used on the RPX CLLF */
diff --git a/drivers/net/ppp/ppp_async.c b/drivers/net/ppp/ppp_async.c
index 9c889e030..feb9569e3 100644
--- a/drivers/net/ppp/ppp_async.c
+++ b/drivers/net/ppp/ppp_async.c
@@ -34,7 +34,7 @@
#include <linux/jiffies.h>
#include <linux/slab.h>
#include <asm/unaligned.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/string.h>
#define PPP_VERSION "2.4.2"
diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c
index 925d3e295..9ae53986c 100644
--- a/drivers/net/ppp/ppp_synctty.c
+++ b/drivers/net/ppp/ppp_synctty.c
@@ -47,7 +47,7 @@
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <asm/unaligned.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define PPP_VERSION "2.4.2"
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
index 2840cf608..df1165f36 100644
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
@@ -83,7 +83,7 @@
#include <net/netns/generic.h>
#include <net/sock.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define PPPOE_HASH_BITS 4
#define PPPOE_HASH_SIZE (1 << PPPOE_HASH_BITS)
diff --git a/drivers/net/ppp/pppolac.c b/drivers/net/ppp/pppolac.c
index a5d3d634f..561cc199e 100644
--- a/drivers/net/ppp/pppolac.c
+++ b/drivers/net/ppp/pppolac.c
@@ -35,7 +35,7 @@
#include <linux/if_pppox.h>
#include <linux/ppp_channel.h>
#include <net/tcp_states.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define L2TP_CONTROL_BIT 0x80
#define L2TP_LENGTH_BIT 0x40
diff --git a/drivers/net/ppp/pppopns.c b/drivers/net/ppp/pppopns.c
index 6016d29c0..8f2967bf8 100644
--- a/drivers/net/ppp/pppopns.c
+++ b/drivers/net/ppp/pppopns.c
@@ -34,7 +34,7 @@
#include <linux/if_ppp.h>
#include <linux/if_pppox.h>
#include <linux/ppp_channel.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define GRE_HEADER_SIZE 8
diff --git a/drivers/net/ppp/pppox.c b/drivers/net/ppp/pppox.c
index 2940e9fe3..525353467 100644
--- a/drivers/net/ppp/pppox.c
+++ b/drivers/net/ppp/pppox.c
@@ -34,7 +34,7 @@
#include <net/sock.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static const struct pppox_proto *pppox_protos[PX_MAX_PROTO + 1];
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index 66c2f1a01..6dc02bf25 100644
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -55,7 +55,7 @@ static char version[] = "sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)\n";
#include <asm/io.h>
#include <asm/processor.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef SB1000_DEBUG
static int sb1000_debug = SB1000_DEBUG;
diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
index b52eabc16..9fa089278 100644
--- a/drivers/net/slip/slhc.c
+++ b/drivers/net/slip/slhc.c
@@ -75,7 +75,7 @@
#include <linux/skbuff.h>
#include <net/sock.h>
#include <linux/timer.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <net/checksum.h>
#include <asm/unaligned.h>
diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index ca3e73753..4af398efd 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -64,7 +64,7 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/bitops.h>
#include <linux/sched.h>
#include <linux/string.h>
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index d818f990c..4d68d92a8 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -69,7 +69,7 @@
#include <net/rtnetlink.h>
#include <net/sock.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* Uncomment to enable debugging */
/* #define TUN_DEBUG 1 */
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 57da4c10c..704e31fb8 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -44,7 +44,7 @@
#include <linux/crc32.h>
#include <linux/bitops.h>
#include <linux/gfp.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#undef DEBUG
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 4fbde8a1f..4ac5b4dd0 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -56,7 +56,7 @@
#include <linux/dma-mapping.h>
#include <linux/wait.h>
#include <linux/firmware.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/byteorder.h>
#undef DEBUG
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index f32a57ed1..05f4a5cf8 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -42,7 +42,7 @@
#include <linux/usb.h>
#include <linux/module.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "pegasus.h"
/*
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 59d6a3a58..3c8638f04 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -15,7 +15,7 @@
#include <linux/mii.h>
#include <linux/ethtool.h>
#include <linux/usb.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* Version Information */
#define DRIVER_VERSION "v0.6.2 (2004/08/27)"
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 6a8a382c5..6f4065f55 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -52,7 +52,7 @@
#include <asm/io.h>
#include <asm/dma.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static const char version[] = "DLCI driver v0.35, 4 Jan 1997, mike.mclagan@linux.org";
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 851dc7b7e..28954b9ba 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -95,7 +95,7 @@
#include <asm/cache.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 2dfa1478d..5e6f182be 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -29,7 +29,7 @@
#include <linux/if.h>
#include <linux/hdlc.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "farsync.h"
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index 62f01b74c..df513e6ec 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -40,7 +40,7 @@
#include <linux/string.h>
#include <linux/types.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "hd64570.h"
#define get_msci(port) (phy_node(port) ? MSCI1_OFFSET : MSCI0_OFFSET)
diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c
index 6269a09c7..97b8caea9 100644
--- a/drivers/net/wan/hd64572.c
+++ b/drivers/net/wan/hd64572.c
@@ -40,7 +40,7 @@
#include <linux/string.h>
#include <linux/types.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "hd64572.h"
#define NAPI_WEIGHT 16
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index a73b49eb8..a62536b77 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -35,7 +35,7 @@
#include <linux/if_arp.h>
#include <linux/skbuff.h>
#include <net/sock.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
#include <linux/notifier.h>
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 7ef435bab..1eb14cd8d 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -60,7 +60,7 @@
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/io.h>
#include <asm/dma.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
//#include <asm/spinlock.h>
#define DRIVER_MAJOR_VERSION 1
diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
index 5920c996f..dbe0e2065 100644
--- a/drivers/net/wan/lmc/lmc_media.c
+++ b/drivers/net/wan/lmc/lmc_media.c
@@ -19,7 +19,7 @@
#include <asm/io.h>
#include <asm/dma.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "lmc.h"
#include "lmc_var.h"
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index d43f4efd3..7f7027e12 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -62,7 +62,7 @@
#include <asm/types.h>
#include <asm/byteorder.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "sbni.h"
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index de3bbf43f..5594170c4 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -56,7 +56,7 @@
#include <asm/io.h>
#include <asm/dma.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static const char* version = "SDLA driver v0.30, 12 Sep 1996, mike.mclagan@linux.org";
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 6125adb52..eee490777 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -45,7 +45,7 @@
#include <linux/if_arp.h>
#include <linux/ioport.h>
#include <linux/pci.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/kthread.h>
#include <linux/freezer.h>
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index b827d51c3..b5ac8804b 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -50,7 +50,7 @@
#include <linux/timer.h>
#include <asm/byteorder.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/module.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index f8639003d..2707b9900 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -32,7 +32,7 @@
#include <asm/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/slab.h>
#include <linux/netdevice.h>
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 15f0fad39..51a090ed9 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -27,7 +27,7 @@
#include <net/net_namespace.h>
#include <net/iw_handler.h>
#include <net/lib80211.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "hostap_wlan.h"
#include "hostap_80211.h"
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 15920aaa5..1d4327881 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -148,7 +148,7 @@ that only one external action is invoked at a time.
#include <linux/dma-mapping.h>
#include <linux/proc_fs.h>
#include <linux/skbuff.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <linux/fs.h>
#include <linux/mm.h>
diff --git a/drivers/net/wireless/ipw2x00/libipw_geo.c b/drivers/net/wireless/ipw2x00/libipw_geo.c
index 218f2a32d..ce7eda20a 100644
--- a/drivers/net/wireless/ipw2x00/libipw_geo.c
+++ b/drivers/net/wireless/ipw2x00/libipw_geo.c
@@ -38,7 +38,7 @@
#include <linux/types.h>
#include <linux/wireless.h>
#include <linux/etherdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "libipw.h"
diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c
index 3adb24021..a9e23a193 100644
--- a/drivers/net/wireless/ipw2x00/libipw_module.c
+++ b/drivers/net/wireless/ipw2x00/libipw_module.c
@@ -46,7 +46,7 @@
#include <linux/types.h>
#include <linux/wireless.h>
#include <linux/etherdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <net/net_namespace.h>
#include <net/arp.h>
diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c
index 95a1ca1e8..c96e33d61 100644
--- a/drivers/net/wireless/ipw2x00/libipw_rx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_rx.c
@@ -29,7 +29,7 @@
#include <linux/types.h>
#include <linux/wireless.h>
#include <linux/etherdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/ctype.h>
#include <net/lib80211.h>
diff --git a/drivers/net/wireless/ipw2x00/libipw_tx.c b/drivers/net/wireless/ipw2x00/libipw_tx.c
index e8c039879..048f1e3ad 100644
--- a/drivers/net/wireless/ipw2x00/libipw_tx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_tx.c
@@ -39,7 +39,7 @@
#include <linux/types.h>
#include <linux/wireless.h>
#include <linux/etherdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "libipw.h"
diff --git a/drivers/net/wireless/prism54/isl_38xx.c b/drivers/net/wireless/prism54/isl_38xx.c
index 02fc67bcc..fba955b61 100644
--- a/drivers/net/wireless/prism54/isl_38xx.c
+++ b/drivers/net/wireless/prism54/isl_38xx.c
@@ -21,7 +21,7 @@
#include <linux/types.h>
#include <linux/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include "prismcompat.h"
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 1c22b81e6..2430fd9ff 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -26,7 +26,7 @@
#include <linux/slab.h>
#include <linux/pci.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "prismcompat.h"
#include "isl_ioctl.h"
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 9b557a1bb..b17592c7c 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -54,7 +54,7 @@
#include <asm/io.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* Warning : these stuff will slow down the driver... */
#define WIRELESS_SPY /* Enable spying addresses */
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 38d2089f3..f98edbb5d 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -52,7 +52,7 @@
#include <pcmcia/ds.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "wl3501.h"
diff --git a/drivers/nubus/proc.c b/drivers/nubus/proc.c
index 5371b374f..e8f68f573 100644
--- a/drivers/nubus/proc.c
+++ b/drivers/nubus/proc.c
@@ -25,7 +25,7 @@
#include <linux/init.h>
#include <linux/module.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/byteorder.h>
static int
diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
index c0cc4e7ff..67935fbbb 100644
--- a/drivers/oprofile/event_buffer.c
+++ b/drivers/oprofile/event_buffer.c
@@ -18,7 +18,7 @@
#include <linux/capability.h>
#include <linux/dcookies.h>
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "oprof.h"
#include "event_buffer.h"
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
index 7c12d9c2b..19321ae4e 100644
--- a/drivers/oprofile/oprofilefs.c
+++ b/drivers/oprofile/oprofilefs.c
@@ -15,7 +15,7 @@
#include <linux/oprofile.h>
#include <linux/fs.h>
#include <linux/pagemap.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "oprof.h"
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 8b490d770..e023d5d3c 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -48,7 +48,7 @@
#include <asm/byteorder.h>
#include <asm/cache.h> /* for L1_CACHE_BYTES */
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/page.h>
#include <asm/dma.h>
#include <asm/io.h>
diff --git a/drivers/parisc/ccio-rm-dma.c b/drivers/parisc/ccio-rm-dma.c
index f78f6f1ae..1bf988010 100644
--- a/drivers/parisc/ccio-rm-dma.c
+++ b/drivers/parisc/ccio-rm-dma.c
@@ -40,7 +40,7 @@
#include <linux/pci.h>
#include <linux/gfp.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/hardware.h>
diff --git a/drivers/parisc/eisa_eeprom.c b/drivers/parisc/eisa_eeprom.c
index af212c6a6..5d9b199a0 100644
--- a/drivers/parisc/eisa_eeprom.c
+++ b/drivers/parisc/eisa_eeprom.c
@@ -26,7 +26,7 @@
#include <linux/slab.h>
#include <linux/fs.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/eisa_eeprom.h>
#define EISA_EEPROM_MINOR 241
diff --git a/drivers/parisc/eisa_enumerator.c b/drivers/parisc/eisa_enumerator.c
index caa153133..ea0f7cb16 100644
--- a/drivers/parisc/eisa_enumerator.c
+++ b/drivers/parisc/eisa_enumerator.c
@@ -15,7 +15,7 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/byteorder.h>
#include <asm/eisa_bus.h>
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index b48243131..ff1a332d7 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -49,7 +49,7 @@
#include <asm/param.h> /* HZ */
#include <asm/led.h>
#include <asm/pdc.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* The control of the LEDs and LCDs on PARISC-machines have to be done
completely in software. The necessary calculations are done in a work queue
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 0f54ab626..730e9910e 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -68,7 +68,7 @@
#include <asm/pdc.h>
#include <asm/page.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/hardware.h>
#define PDCS_VERSION "0.30"
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index 5bed17f68..d998d0ed2 100644
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -26,7 +26,7 @@
#include <linux/sched.h>
#include <asm/current.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#undef DEBUG
diff --git a/drivers/parport/ieee1284_ops.c b/drivers/parport/ieee1284_ops.c
index 2e21af43d..c0e7d21c8 100644
--- a/drivers/parport/ieee1284_ops.c
+++ b/drivers/parport/ieee1284_ops.c
@@ -18,7 +18,7 @@
#include <linux/parport.h>
#include <linux/delay.h>
#include <linux/sched.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#undef DEBUG /* undef me for production */
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index 6e3a60c78..dd6d4ccb4 100644
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -34,7 +34,7 @@
#include <asm/io.h>
#include <asm/dma.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/superio.h>
#include <linux/parport.h>
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c
index d763bc9e4..4d1d6eaf3 100644
--- a/drivers/parport/probe.c
+++ b/drivers/parport/probe.c
@@ -10,7 +10,7 @@
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static const struct {
const char *token;
diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
index 92ed045a5..e0cf3a9b9 100644
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
@@ -22,7 +22,7 @@
#include <linux/ctype.h>
#include <linux/sysctl.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#if defined(CONFIG_SYSCTL) && defined(CONFIG_PROC_FS)
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index c35e8ad6d..67385f60f 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -32,7 +32,7 @@
#include <acpi/acpi_bus.h>
#include <linux/sysfs.h>
#include <linux/kobject.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/moduleparam.h>
#include <linux/pci.h>
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index c8eaeb43f..bf7be3ea8 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -40,7 +40,7 @@
#include <linux/init.h>
#include <linux/interrupt.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "cpqphp.h"
#include "cpqphp_nvram.h"
diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
index 76ba8a1c7..ae3181bbe 100644
--- a/drivers/pci/hotplug/cpqphp_nvram.c
+++ b/drivers/pci/hotplug/cpqphp_nvram.c
@@ -35,7 +35,7 @@
#include <linux/pci.h>
#include <linux/pci_hotplug.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "cpqphp.h"
#include "cpqphp_nvram.h"
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index ec20f74c8..186dc0fd5 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -39,7 +39,7 @@
#include <linux/mutex.h>
#include <linux/pci.h>
#include <linux/pci_hotplug.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "../pci.h"
#include "cpci_hotplug.h"
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 08126087e..a8ded06a8 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -11,7 +11,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/capability.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/byteorder.h>
#include "pci.h"
diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
index e1c1ec540..f2ddedad5 100644
--- a/drivers/pci/syscall.c
+++ b/drivers/pci/syscall.c
@@ -10,7 +10,7 @@
#include <linux/errno.h>
#include <linux/pci.h>
#include <linux/syscalls.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "pci.h"
SYSCALL_DEFINE5(pciconfig_read, unsigned long, bus, unsigned long, dfn,
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 2ac045f27..6dafea098 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -63,7 +63,7 @@
#include <linux/slab.h>
#include <acpi/acpi_drivers.h>
#include <acpi/acpi_bus.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/sonypi.h>
#include <linux/sony-laptop.h>
#include <linux/rfkill.h>
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 54d31c0a9..4913ec1d2 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -74,7 +74,7 @@
#include <linux/input.h>
#include <linux/leds.h>
#include <linux/rfkill.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/dmi.h>
#include <linux/jiffies.h>
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index eb3467ea6..c1c84ccc6 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -55,7 +55,7 @@
#include <linux/workqueue.h>
#include <linux/i8042.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <acpi/acpi_drivers.h>
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 0c2013172..2854fbf32 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "base.h"
diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c
index 2365ef37a..2d0366a5e 100644
--- a/drivers/pnp/isapnp/proc.c
+++ b/drivers/pnp/isapnp/proc.c
@@ -21,7 +21,7 @@
#include <linux/isapnp.h>
#include <linux/proc_fs.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
extern struct pnp_protocol isapnp_protocol;
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index c212db0fc..5ee6b2a5f 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -26,7 +26,7 @@
#include <linux/seq_file.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "pnpbios.h"
diff --git a/drivers/power/mediatek/battery_common.c b/drivers/power/mediatek/battery_common.c
index b75da558b..5c451cd17 100644
--- a/drivers/power/mediatek/battery_common.c
+++ b/drivers/power/mediatek/battery_common.c
@@ -55,7 +55,7 @@
#include <linux/suspend.h>
#include <asm/scatterlist.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <mach/hardware.h>
diff --git a/drivers/power/mediatek/battery_common_fg_20.c b/drivers/power/mediatek/battery_common_fg_20.c
index f5be7016d..de6a45305 100644
--- a/drivers/power/mediatek/battery_common_fg_20.c
+++ b/drivers/power/mediatek/battery_common_fg_20.c
@@ -55,7 +55,7 @@
#include <linux/suspend.h>
#include <asm/scatterlist.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <mach/hardware.h>
diff --git a/drivers/power/mediatek/battery_meter.c b/drivers/power/mediatek/battery_meter.c
index 2e584e937..41ba3af21 100644
--- a/drivers/power/mediatek/battery_meter.c
+++ b/drivers/power/mediatek/battery_meter.c
@@ -23,7 +23,7 @@
#include <linux/of_address.h>
#endif
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_typedefs.h>
#include <mach/hardware.h>
#include <mach/mt_boot.h>
diff --git a/drivers/power/mediatek/battery_meter_fg_20.c b/drivers/power/mediatek/battery_meter_fg_20.c
index 9eafd1833..9c5914038 100644
--- a/drivers/power/mediatek/battery_meter_fg_20.c
+++ b/drivers/power/mediatek/battery_meter_fg_20.c
@@ -23,7 +23,7 @@
#include <linux/of_address.h>
#endif
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <mach/mt_typedefs.h>
#include <mach/hardware.h>
#include <mach/mt_boot.h>
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index e51cc5fec..3ae589042 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -32,7 +32,7 @@
#include <linux/of.h>
#include <linux/of_device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "rtc-at91rm9200.h"
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index ca0f213c0..968a58261 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -31,7 +31,7 @@
#include <asm/div64.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
MODULE_AUTHOR("Yoichi Yuasa <yuasa@linux-mips.org>");
MODULE_DESCRIPTION("NEC VR4100 series RTC driver");
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index a71bb8aac..58c9f21a3 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -20,7 +20,7 @@
#include <linux/slab.h>
#include <asm/debug.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/ipl.h>
/* This is ugly... */
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 6a44b2762..640cf67c5 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -25,7 +25,7 @@
#include <asm/idals.h>
#include <asm/ebcdic.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/cio.h>
#include <asm/ccwdev.h>
#include <asm/itcw.h>
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 21ef63cf0..112b1dc04 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -20,7 +20,7 @@
#include <linux/err.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/atomic.h>
#include <asm/ebcdic.h>
diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c
index 3250cb471..b3057739a 100644
--- a/drivers/s390/block/dasd_erp.c
+++ b/drivers/s390/block/dasd_erp.c
@@ -15,7 +15,7 @@
#include <asm/debug.h>
#include <asm/ebcdic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* This is ugly... */
#define PRINTK_HEADER "dasd_erp:"
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index f64921756..9d309e4b1 100644
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -16,7 +16,7 @@
#include <linux/fs.h>
#include <linux/blkpg.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* This is ugly... */
#define PRINTK_HEADER "dasd_gendisk:"
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index 8be1b51e9..ba01beacb 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -21,7 +21,7 @@
#include <asm/ccwdev.h>
#include <asm/schid.h>
#include <asm/cmb.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* This is ugly... */
#define PRINTK_HEADER "dasd_ioctl:"
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 78ac905a5..c706d8b26 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -20,7 +20,7 @@
#include <linux/proc_fs.h>
#include <asm/debug.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* This is ugly... */
#define PRINTK_HEADER "dasd_proc:"
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 324a8cd94..f26b26826 100644
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -41,7 +41,7 @@
#include <linux/suspend.h>
#include <linux/platform_device.h>
#include <linux/gfp.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define XPRAM_NAME "xpram"
#define XPRAM_DEVS 1 /* one partition */
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 19915c5b2..b392e130b 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -26,7 +26,7 @@
#include <asm/cio.h>
#include <asm/io.h>
#include <asm/ebcdic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/delay.h>
#include <asm/cpcmd.h>
#include <asm/setup.h>
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index 01463b052..650c511b5 100644
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -14,7 +14,7 @@
#include <linux/consolemap.h>
#include <linux/kbd_kern.h>
#include <linux/kbd_diacr.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "keyboard.h"
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index 0da3ae3cd..ba9f6a160 100644
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -23,7 +23,7 @@
#include <linux/device.h>
#include <linux/slab.h>
#include <net/iucv/iucv.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/ebcdic.h>
#include <asm/extmem.h>
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index 4600aa10a..e4eaec8b5 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -21,7 +21,7 @@
#include <linux/mutex.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/ebcdic.h>
#include <asm/io.h>
#include <asm/appldata.h>
diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c
index 3b13d58fe..b5b1fa338 100644
--- a/drivers/s390/char/sclp_rw.c
+++ b/drivers/s390/char/sclp_rw.c
@@ -13,7 +13,7 @@
#include <linux/string.h>
#include <linux/spinlock.h>
#include <linux/ctype.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "sclp.h"
#include "sclp_rw.h"
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index 7ed7a5987..a62a32b03 100644
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -16,7 +16,7 @@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/gfp.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "ctrlchar.h"
#include "sclp.h"
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index 5aaaa2ec8..6b3b33e46 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -25,7 +25,7 @@
#include <linux/reboot.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "sclp.h"
#define SCLP_VT220_MAJOR TTY_MAJOR
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 6dc60725d..25ff3e1ce 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -18,7 +18,7 @@
#include <linux/mtio.h>
#include <linux/compat.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define TAPE_DBF_AREA tape_core_dbf
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index 4dd71ca02..a996a010f 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -24,7 +24,7 @@
#include <asm/ccwdev.h>
#include <asm/cio.h>
#include <asm/ebcdic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "raw3270.h"
#include "tty3270.h"
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
index 0fdedadff..4e8213edc 100644
--- a/drivers/s390/char/vmcp.c
+++ b/drivers/s390/char/vmcp.c
@@ -21,7 +21,7 @@
#include <asm/compat.h>
#include <asm/cpcmd.h>
#include <asm/debug.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "vmcp.h"
static debug_info_t *vmcp_debug;
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index 5e41e8453..bf92084fd 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -21,7 +21,7 @@
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/cpcmd.h>
#include <asm/debug.h>
#include <asm/ebcdic.h>
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index c180e3135..5c8d02557 100644
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -15,7 +15,7 @@
#include <linux/slab.h>
#include <linux/module.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/cio.h>
#include <asm/ccwdev.h>
#include <asm/debug.h>
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index e9b72311e..f132f10e3 100644
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -23,7 +23,7 @@
#include <asm/ebcdic.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define MAX_CMDLEN 240
#define MIN_INTERVAL 15
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index 9e5e14686..18028cb22 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -21,7 +21,7 @@
#include <asm/ipl.h>
#include <asm/sclp.h>
#include <asm/setup.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/debug.h>
#include <asm/processor.h>
#include <asm/irqflags.h>
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index a9fe3de2d..2e9f65bc2 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -17,7 +17,7 @@
#include <linux/ctype.h>
#include <linux/device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/cio.h>
#include <asm/ipl.h>
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 31cfaa556..487efb6aa 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -36,7 +36,7 @@
#include <linux/compat.h>
#include <linux/slab.h>
#include <linux/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/hw_random.h>
#include <linux/debugfs.h>
#include <asm/debug.h>
diff --git a/drivers/s390/crypto/zcrypt_cex2a.c b/drivers/s390/crypto/zcrypt_cex2a.c
index 1e849d6e1..247960e99 100644
--- a/drivers/s390/crypto/zcrypt_cex2a.c
+++ b/drivers/s390/crypto/zcrypt_cex2a.c
@@ -30,7 +30,7 @@
#include <linux/init.h>
#include <linux/err.h>
#include <linux/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "ap_bus.h"
#include "zcrypt_api.h"
diff --git a/drivers/s390/crypto/zcrypt_pcica.c b/drivers/s390/crypto/zcrypt_pcica.c
index f2b71d8df..4779915a9 100644
--- a/drivers/s390/crypto/zcrypt_pcica.c
+++ b/drivers/s390/crypto/zcrypt_pcica.c
@@ -29,7 +29,7 @@
#include <linux/init.h>
#include <linux/err.h>
#include <linux/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "ap_bus.h"
#include "zcrypt_api.h"
diff --git a/drivers/s390/crypto/zcrypt_pcicc.c b/drivers/s390/crypto/zcrypt_pcicc.c
index 0d90a4334..819d1f46d 100644
--- a/drivers/s390/crypto/zcrypt_pcicc.c
+++ b/drivers/s390/crypto/zcrypt_pcicc.c
@@ -29,7 +29,7 @@
#include <linux/gfp.h>
#include <linux/err.h>
#include <linux/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "ap_bus.h"
#include "zcrypt_api.h"
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c
index 899ffa19f..f8de77568 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -31,7 +31,7 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "ap_bus.h"
#include "zcrypt_api.h"
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 9ca3996f6..145cbe511 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -62,7 +62,7 @@
#include <net/dst.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/ebcdic.h>
#include <net/iucv/iucv.h>
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index fc1339cf9..ffdbb2267 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -17,7 +17,7 @@
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/atomic.h>
-#include <asm/uaccess.h> /* put_/get_user */
+#include <linux/uaccess.h> /* put_/get_user */
#include <asm/io.h>
#include <asm/display7seg.h>
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index ddbe5a9e7..d93d91fc2 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -30,7 +30,7 @@
#include <linux/of.h>
#include <linux/of_device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/envctrl.h>
#include <asm/io.h>
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index d9f268f23..607aca0ba 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -16,7 +16,7 @@
#include <linux/of.h>
#include <linux/of_device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/pgtable.h>
#include <asm/io.h>
#include <asm/upa.h>
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 6b4678a79..96e201e8e 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -37,7 +37,7 @@
#include <linux/string.h>
#include <linux/genhd.h>
#include <linux/blkdev.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/pgtable.h>
#include <asm/io.h>
#include <asm/pcic.h>
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 5843288f6..2d2b6792d 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -40,7 +40,7 @@
#include <linux/fs.h>
#include <asm/oplib.h>
#include <asm/prom.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/openpromio.h>
#ifdef CONFIG_PCI
#include <linux/pci.h>
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 6adf9abdf..c51d891c4 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -95,7 +95,7 @@
#include <linux/slab.h>
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <scsi/scsi.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_tcq.h>
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
index 61702ac00..986324b88 100644
--- a/drivers/scsi/3w-sas.c
+++ b/drivers/scsi/3w-sas.c
@@ -67,7 +67,7 @@
#include <linux/slab.h>
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <scsi/scsi.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_tcq.h>
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 8843ad783..cacdd0eff 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -211,7 +211,7 @@
#include <linux/mutex.h>
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <scsi/scsi.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_tcq.h>
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 681434e2d..c1490704a 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -32,7 +32,7 @@
#include <linux/slab.h>
#include <linux/completion.h>
#include <linux/blkdev.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/highmem.h> /* For flush_kernel_dcache_page */
#include <linux/module.h>
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index d6fcadd7d..860ae4b8a 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -41,7 +41,7 @@
#include <linux/delay.h> /* ssleep prototype */
#include <linux/kthread.h>
#include <linux/semaphore.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <scsi/scsi_host.h>
#include "aacraid.h"
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 8d9477cc3..cba85a5d2 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -61,7 +61,7 @@
#include <linux/aer.h>
#include <asm/dma.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index ae2564d31..cfbd68107 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -26,7 +26,7 @@
#include <linux/fs.h>
#include <linux/pci.h>
#include <linux/firmware.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/fcntl.h>
#include "bfad_drv.h"
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 19e1b4222..b9202885d 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -37,7 +37,7 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Driver");
////////////////////////////////////////////////////////////////
#include <linux/ioctl.h> /* For SCSI-Passthrough */
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/stat.h>
#include <linux/slab.h> /* for kmalloc() */
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index aec3d4da2..4d615325c 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -130,7 +130,7 @@
#include <asm/dma.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/spinlock.h>
#include <linux/blkdev.h>
#include <linux/scatterlist.h>
diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index ee196b363..618ad262c 100644
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -26,7 +26,7 @@
#include <linux/timer.h>
#include <linux/spinlock.h>
#include <linux/gfp.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/div64.h>
#include <scsi/scsi_cmnd.h>
diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
index 45b9566b9..b782bb60b 100644
--- a/drivers/scsi/ips.h
+++ b/drivers/scsi/ips.h
@@ -51,7 +51,7 @@
#define _IPS_H_
#include <linux/nmi.h>
- #include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
/*
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 60cf7b1f5..a8a13940c 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -34,7 +34,7 @@
#include <linux/mm.h>
#include <linux/fs.h>
#include <linux/blkdev.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <linux/completion.h>
#include <linux/delay.h>
diff --git a/drivers/scsi/megaraid/megaraid_mm.h b/drivers/scsi/megaraid/megaraid_mm.h
index 55b425c0a..a30e725f2 100644
--- a/drivers/scsi/megaraid/megaraid_mm.h
+++ b/drivers/scsi/megaraid/megaraid_mm.h
@@ -17,7 +17,7 @@
#include <linux/spinlock.h>
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/pci.h>
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 0626a168c..9332330d1 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -43,7 +43,7 @@
#include <linux/delay.h>
#include <linux/uio.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/fs.h>
#include <linux/compat.h>
#include <linux/blkdev.h>
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 0727ea7cc..a1a4da597 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -52,7 +52,7 @@ static const char * osst_version = "0.99.4";
#include <linux/delay.h>
#include <linux/jiffies.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/dma.h>
/* The driver prints some debugging information on the console if DEBUG
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 3bef6736d..3458e2a5c 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -9,7 +9,7 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/*
* NVRAM support routines
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index d9564fb04..54d475c14 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -12,7 +12,7 @@
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/string.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index 86f0c5d5c..526acdf3d 100644
--- a/drivers/scsi/scsi_proc.c
+++ b/drivers/scsi/scsi_proc.c
@@ -26,7 +26,7 @@
#include <linux/seq_file.h>
#include <linux/mutex.h>
#include <linux/gfp.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <scsi/scsi.h>
#include <scsi/scsi_device.h>
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 1b1f47c66..ccdee71a7 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -51,7 +51,7 @@
#include <linux/async.h>
#include <linux/slab.h>
#include <linux/pm_runtime.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/unaligned.h>
#include <scsi/scsi.h>
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index c1f23abd7..026e1616b 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -46,7 +46,7 @@
#include <linux/mutex.h>
#include <linux/slab.h>
#include <linux/pm_runtime.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <scsi/scsi.h>
#include <scsi/scsi_dbg.h>
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index a3911c39e..efff2fba8 100644
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -10,7 +10,7 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <scsi/scsi.h>
#include <scsi/scsi_dbg.h>
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 882b31c54..938d17027 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -41,7 +41,7 @@ static const char *verstr = "20101219";
#include <linux/delay.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/dma.h>
#include <scsi/scsi.h>
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index a08f923b9..b298fbf03 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -37,7 +37,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/spidev.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/*
diff --git a/drivers/staging/bcm/headers.h b/drivers/staging/bcm/headers.h
index da47db8c8..9b525b824 100644
--- a/drivers/staging/bcm/headers.h
+++ b/drivers/staging/bcm/headers.h
@@ -34,7 +34,7 @@
#include <linux/tcp.h>
#include <linux/udp.h>
#include <linux/usb.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <net/ip.h>
#include "Typedefs.h"
diff --git a/drivers/staging/csr/drv.c b/drivers/staging/csr/drv.c
index bdc25236a..0b4569fa8 100644
--- a/drivers/staging/csr/drv.c
+++ b/drivers/staging/csr/drv.c
@@ -33,7 +33,7 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/poll.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/jiffies.h>
#include <linux/version.h>
diff --git a/drivers/staging/csr/firmware.c b/drivers/staging/csr/firmware.c
index b42a4d6a0..7193790c2 100644
--- a/drivers/staging/csr/firmware.c
+++ b/drivers/staging/csr/firmware.c
@@ -19,7 +19,7 @@
#include <linux/kmod.h>
#include <linux/vmalloc.h>
#include <linux/firmware.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "csr_wifi_hip_unifi.h"
#include "csr_wifi_hip_unifi_udi.h"
#include "unifiio.h"
diff --git a/drivers/staging/csr/sme_wext.c b/drivers/staging/csr/sme_wext.c
index 458bca062..3de89000b 100644
--- a/drivers/staging/csr/sme_wext.c
+++ b/drivers/staging/csr/sme_wext.c
@@ -16,7 +16,7 @@
#include <linux/types.h>
#include <linux/etherdevice.h>
#include <linux/if_arp.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/ctype.h>
#include "unifi_priv.h"
#include <linux/rtnetlink.h>
diff --git a/drivers/staging/cxt1e1/hwprobe.c b/drivers/staging/cxt1e1/hwprobe.c
index de8ac0bc2..5d55dc109 100644
--- a/drivers/staging/cxt1e1/hwprobe.c
+++ b/drivers/staging/cxt1e1/hwprobe.c
@@ -17,7 +17,7 @@
#include <linux/netdevice.h>
#include <linux/hdlc.h>
#include <linux/if_arp.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/rtnetlink.h>
#include <linux/pci.h>
#include "pmcc4_sysdep.h"
diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c
index a829b6231..97a909837 100644
--- a/drivers/staging/cxt1e1/linux.c
+++ b/drivers/staging/cxt1e1/linux.c
@@ -20,7 +20,7 @@
#include <linux/hdlc.h>
#include <linux/if_arp.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/rtnetlink.h>
#include <linux/skbuff.h>
#include "pmcc4_sysdep.h"
diff --git a/drivers/staging/cxt1e1/sbeproc.c b/drivers/staging/cxt1e1/sbeproc.c
index 9361dd8ce..1c4d29e63 100644
--- a/drivers/staging/cxt1e1/sbeproc.c
+++ b/drivers/staging/cxt1e1/sbeproc.c
@@ -21,7 +21,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/sched.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "pmcc4_sysdep.h"
#include "sbecom_inline_linux.h"
#include "pmcc4_private.h"
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
index 47cc365c6..f94c5163a 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
@@ -31,7 +31,7 @@
#include <linux/timer.h>
#include <linux/delay.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/vmalloc.h>
#include "ft1000.h"
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
index 94e426e4d..a8b787369 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
@@ -24,7 +24,7 @@
#include <linux/vmalloc.h>
#include <linux/netdevice.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "ft1000.h"
#define FT1000_PROC "ft1000"
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index 00f9af06a..ee60d6a18 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@ -20,7 +20,7 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/etherdevice.h>
#include "dot11d.h"
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c
index 89ed86ef0..34ce177e5 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c
@@ -49,7 +49,7 @@
#include <linux/types.h>
#include <linux/wireless.h>
#include <linux/etherdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/if_vlan.h>
#include "ieee80211.h"
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
index e0870c05a..2802c669f 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
@@ -48,7 +48,7 @@
#include <linux/types.h>
#include <linux/wireless.h>
#include <linux/etherdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <net/arp.h>
#include "ieee80211.h"
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
index 900adc12e..d2e4e364c 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
@@ -39,7 +39,7 @@
#include <linux/types.h>
#include <linux/wireless.h>
#include <linux/etherdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/ctype.h>
#include "ieee80211.h"
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index 294e08def..31817a5bf 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -19,7 +19,7 @@
#include <linux/random.h>
#include <linux/delay.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/etherdevice.h>
#include "dot11d.h"
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
index 63c7bb3c2..692f69b0f 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
@@ -49,7 +49,7 @@
#include <linux/types.h>
#include <linux/wireless.h>
#include <linux/etherdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/if_vlan.h>
#include "ieee80211.h"
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index e30c5620c..d7f8dfa41 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -58,7 +58,7 @@ double __extendsfdf2(float a) {return a;}
#define CONFIG_RTL8192_IO_MAP
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "r8192U_hw.h"
#include "r8192U.h"
#include "r8190_rtl8256.h" /* RTL8225 Radio frontend */
diff --git a/drivers/staging/sb105x/sb_pci_mp.h b/drivers/staging/sb105x/sb_pci_mp.h
index a15f470a1..f2656dfd7 100644
--- a/drivers/staging/sb105x/sb_pci_mp.h
+++ b/drivers/staging/sb105x/sb_pci_mp.h
@@ -16,7 +16,7 @@
#include <linux/pci.h>
#include <linux/circ_buf.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/segment.h>
diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c
index f28f15bae..df43d04d0 100644
--- a/drivers/staging/wlags49_h2/wl_main.c
+++ b/drivers/staging/wlags49_h2/wl_main.c
@@ -89,7 +89,7 @@
// #include <asm/io.h>
// // #include <asm/bitops.h>
#include <linux/unistd.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c
index 6226e5eeb..bb8a76ee3 100644
--- a/drivers/staging/wlags49_h2/wl_pci.c
+++ b/drivers/staging/wlags49_h2/wl_pci.c
@@ -80,7 +80,7 @@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/bitops.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/ethtool.h>
#include <linux/netdevice.h>
diff --git a/drivers/staging/wlags49_h2/wl_profile.c b/drivers/staging/wlags49_h2/wl_profile.c
index beabf5916..de8f440b2 100644
--- a/drivers/staging/wlags49_h2/wl_profile.c
+++ b/drivers/staging/wlags49_h2/wl_profile.c
@@ -84,7 +84,7 @@
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/unistd.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <limits.h>
#define BIN_DL 1
diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c
index c731ff2a6..fe17b4c4a 100644
--- a/drivers/staging/wlags49_h2/wl_wext.c
+++ b/drivers/staging/wlags49_h2/wl_wext.c
@@ -63,7 +63,7 @@
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/etherdevice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <debug.h>
#include <hcf.h>
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index 083710e02..9468d2945 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -128,7 +128,7 @@ static struct serial_state rs_table[1];
#define NR_PORTS ARRAY_SIZE(rs_table)
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define serial_isroot() (capable(CAP_SYS_ADMIN))
diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
index f179033ea..6c4a30dd7 100644
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
@@ -42,7 +42,7 @@
#include <linux/slab.h>
#include <linux/serial_core.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "hvc_console.h"
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index 81e939e90..5803968bf 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -81,7 +81,7 @@
#include <linux/tty_flip.h>
#include <asm/hvconsole.h>
#include <asm/hvcserver.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/vio.h>
/*
diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
index 41901997c..f57aae29f 100644
--- a/drivers/tty/hvc/hvsi.c
+++ b/drivers/tty/hvc/hvsi.c
@@ -46,7 +46,7 @@
#include <asm/hvcall.h>
#include <asm/hvconsole.h>
#include <asm/prom.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/vio.h>
#include <asm/param.h>
#include <asm/hvsi.h>
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index 1deaca467..d97f1174e 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -47,7 +47,7 @@
#include <linux/ratelimit.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "moxa.h"
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 4c4a23674..ec0edc56b 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -43,7 +43,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "mxser.h"
diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c
index 10e0c86cc..f3b4bc23c 100644
--- a/drivers/tty/n_hdlc.c
+++ b/drivers/tty/n_hdlc.c
@@ -103,7 +103,7 @@
#include <linux/bitops.h>
#include <asm/termios.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/*
* Buffers for individual HDLC frames
diff --git a/drivers/tty/n_r3964.c b/drivers/tty/n_r3964.c
index 1e6405070..c913c1c36 100644
--- a/drivers/tty/n_r3964.c
+++ b/drivers/tty/n_r3964.c
@@ -65,7 +65,7 @@
#include <linux/n_r3964.h>
#include <linux/poll.h>
#include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/*#define DEBUG_QUEUE*/
diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c
index 5dc9c4bfa..4465a48b2 100644
--- a/drivers/tty/serial/68328serial.c
+++ b/drivers/tty/serial/68328serial.c
@@ -40,7 +40,7 @@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/delay.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/* (es) */
/* note: perhaps we can murge these files, so that you can just
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index 18ed5aebb..7f654e494 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -54,7 +54,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "icom.h"
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 57977ec53..3eb1a6a31 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -35,7 +35,7 @@
#include <linux/mutex.h>
#include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
/*
* This is used to lock changes in serial line configuration.
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index 8eaf1ab8a..a48addcb4 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -107,7 +107,7 @@
#define PUT_USER(error,value,addr) error = put_user(value,addr)
#define COPY_TO_USER(error,dest,src,size) error = copy_to_user(dest,src,size) ? -EFAULT : 0
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define RCLRVALUE 0xffff
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 1abf94646..24a00a084 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -77,7 +77,7 @@
#include <asm/irq.h>
#include <asm/dma.h>
#include <asm/types.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#if defined(CONFIG_HDLC) || (defined(CONFIG_HDLC_MODULE) && defined(CONFIG_SYNCLINK_GT_MODULE))
#define SYNCLINK_GENERIC_HDLC 1
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index ff171384e..87fb51c4d 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -79,7 +79,7 @@
#define PUT_USER(error,value,addr) error = put_user(value,addr)
#define COPY_TO_USER(error,dest,src,size) error = copy_to_user(dest,src,size) ? -EFAULT : 0
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static MGSL_PARAMS default_params = {
MGSL_MODE_HDLC, /* unsigned long mode */
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index b46aca5cc..47bc75559 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -22,7 +22,7 @@
#include <linux/compat.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#undef TTY_DEBUG_WAIT_UNTIL_SENT
diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index 2978ca596..9b6b5ee13 100644
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -18,7 +18,7 @@
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/tty.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/console.h>
#include <linux/consolemap.h>
#include <linux/vt_kern.h>
diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c
index 60b7b6926..03cdc3dfe 100644
--- a/drivers/tty/vt/selection.c
+++ b/drivers/tty/vt/selection.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <linux/types.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/kbd_kern.h>
#include <linux/vt_kern.h>
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index d7799deac..1d43bc12f 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -39,7 +39,7 @@
#include <linux/slab.h>
#include <linux/notifier.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/byteorder.h>
#include <asm/unaligned.h>
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 2bd78e2ac..864c5e5d2 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -29,7 +29,7 @@
#include <linux/timex.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/kbd_kern.h>
#include <linux/vt_kern.h>
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index 38c8a11bb..464c37483 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -64,7 +64,7 @@
#include "usbatm.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/crc32.h>
#include <linux/errno.h>
#include <linux/init.h>
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 561ebede4..658bc97f1 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -49,7 +49,7 @@
#include <linux/security.h>
#include <linux/user_namespace.h>
#include <linux/scatterlist.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/byteorder.h>
#include <linux/moduleparam.h>
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 860096805..e760de085 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -28,7 +28,7 @@
#include <linux/random.h>
#include <linux/pm_qos.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/byteorder.h>
#include "hub.h"
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
index 15d993571..385ceb18c 100644
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@ -2619,7 +2619,7 @@ static int android_create_device(struct android_dev *dev)
#ifdef CONFIG_USBIF_COMPLIANCE
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/seq_file.h>
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index a4797bcfd..027eedf56 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -20,7 +20,7 @@
#include <linux/uts.h>
#include <linux/wait.h>
#include <linux/compiler.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/poll.h>
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 4a86b6374..13460ce9c 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -42,7 +42,7 @@
#include <linux/bitops.h>
#include <linux/dmi.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/irq.h>
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 90f85d8a3..59aed2dd6 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -31,7 +31,7 @@
#include "xhci.h"
#ifdef CONFIG_MTK_XHCI
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h>
#include <linux/xhci/xhci-mtk-scheduler.h>
@@ -40,7 +40,7 @@
#ifdef CONFIG_USBIF_COMPLIANCE
#include <linux/proc_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/seq_file.h>
#include <linux/kobject.h>
#include <linux/miscdevice.h>
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index 50663dcce..3b866e0aa 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -25,7 +25,7 @@
#include <linux/module.h>
#include <linux/usb.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef CONFIG_USB_DEBUG
static int debug = 5;
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index aae550219..19bef43b5 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -45,7 +45,7 @@
#include <linux/module.h>
#include <linux/kref.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/usb.h>
#include <linux/workqueue.h>
#include <linux/platform_device.h>
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c
index 3b885c61b..3aacef958 100644
--- a/drivers/usb/misc/idmouse.c
+++ b/drivers/usb/misc/idmouse.c
@@ -24,7 +24,7 @@
#include <linux/module.h>
#include <linux/completion.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/usb.h>
/* image constants */
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index ac762299e..6a96681c6 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -29,7 +29,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/input.h>
#include <linux/usb.h>
#include <linux/poll.h>
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index c3e9cfc7c..13bb4387c 100644
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -82,7 +82,7 @@
#include <linux/module.h>
#include <linux/completion.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/usb.h>
#include <linux/poll.h>
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
index 9a62e89d6..8bddf2728 100644
--- a/drivers/usb/mon/mon_bin.c
+++ b/drivers/usb/mon/mon_bin.c
@@ -19,7 +19,7 @@
#include <linux/scatterlist.h>
#include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "usb_mon.h"
diff --git a/drivers/usb/mon/mon_stat.c b/drivers/usb/mon/mon_stat.c
index ebd6189a5..69cf46885 100644
--- a/drivers/usb/mon/mon_stat.c
+++ b/drivers/usb/mon/mon_stat.c
@@ -12,7 +12,7 @@
#include <linux/export.h>
#include <linux/usb.h>
#include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "usb_mon.h"
diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
index 060d78d53..236c58b99 100644
--- a/drivers/usb/mon/mon_text.c
+++ b/drivers/usb/mon/mon_text.c
@@ -13,7 +13,7 @@
#include <linux/mutex.h>
#include <linux/debugfs.h>
#include <linux/scatterlist.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "usb_mon.h"
diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c
index 4c216790e..e5759df69 100644
--- a/drivers/usb/musb/musb_debugfs.c
+++ b/drivers/usb/musb/musb_debugfs.c
@@ -37,7 +37,7 @@
#include <linux/debugfs.h>
#include <linux/seq_file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "musb_core.h"
#include "musb_debug.h"
diff --git a/drivers/video/68328fb.c b/drivers/video/68328fb.c
index fa44fbed3..3a41b765d 100644
--- a/drivers/video/68328fb.c
+++ b/drivers/video/68328fb.c
@@ -35,7 +35,7 @@
#include <linux/vmalloc.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/fb.h>
#include <linux/init.h>
diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index b05afd037..10e0376b0 100644
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -21,7 +21,7 @@
#include <linux/slab.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/gio_device.h>
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index c2414d6ab..d61da14c2 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -22,7 +22,7 @@
#include <linux/fb.h>
#include <asm/machvec.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/pgtable.h>
#include <asm/io.h>
#include <asm/hd64461.h>
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index b802f93ce..eaedd38d9 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -16,7 +16,7 @@
#include <linux/dio.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
static struct fb_info fb_info = {
.fix = {
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index cfdb380ec..0bb9e4f77 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -32,7 +32,7 @@
#include <linux/platform_data/video-mx3fb.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#define MX3FB_NAME "mx3_sdc_fb"
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index d44c7351d..d422ba687 100644
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -18,7 +18,7 @@
#include <linux/interrupt.h>
#include <linux/platform_device.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/setup.h>
#include <asm/q40_master.h>
#include <linux/fb.h>
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index 150197909..27c7dd3cf 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -31,7 +31,7 @@
#include <linux/console.h>
#include <linux/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/div64.h>
#ifdef CONFIG_PM
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index 019a1feef..993c6f9a7 100644
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -66,7 +66,7 @@
#include <linux/ioport.h>
#include <asm/grfioctl.h> /* for HP-UX compatibility */
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "sticore.h"
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 7a299e951..85196bad8 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -35,7 +35,7 @@
#include <linux/vmalloc.h>
#include <linux/module.h>
#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <video/w100fb.h>
#include "w100fb.h"
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index 1c15ee745..305c2bb51 100644
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -14,7 +14,7 @@
#include <linux/seq_file.h>
#include <linux/init.h>
#include <linux/export.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <asm/amigahw.h>
#include <asm/setup.h>