diff options
| -rw-r--r-- | drivers/misc/Makefile | 6 | ||||
| -rwxr-xr-x | drivers/misc/mediatek/Makefile | 2 | ||||
| -rwxr-xr-x | drivers/misc/mediatek/combo_mt66xx/Makefile | 8 | ||||
| -rwxr-xr-x | drivers/misc/mediatek/combo_mt66xx/bt/Makefile | 2 | ||||
| -rw-r--r-- | drivers/spi/Makefile | 2 | ||||
| -rwxr-xr-x | include/linux/wmt-mb.h | 33 |
6 files changed, 28 insertions, 25 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index f2e3c9ef..4ba6e708 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -54,9 +54,9 @@ obj-$(CONFIG_WL127X_RFKILL) += wl127x-rfkill.o obj-$(CONFIG_SENSORS_AK8975) += akm8975.o obj-y += rsa/ obj-y += viatel/ -obj-y += mediatek/ -wmt_pn547-objs += pn547.o +#obj-y += mediatek/ +wmt_pn547-objs += pn547.o obj-$(CONFIG_PN547_NFC) += wmt_pn547.o s_wmt_nfc_bcm2079x-objs += bcm2079x-i2c.o -obj-$(CONFIG_BCM2079X_NFC) += s_wmt_nfc_bcm2079x.o
\ No newline at end of file +obj-$(CONFIG_BCM2079X_NFC) += s_wmt_nfc_bcm2079x.o diff --git a/drivers/misc/mediatek/Makefile b/drivers/misc/mediatek/Makefile index d308cb1c..772f364c 100755 --- a/drivers/misc/mediatek/Makefile +++ b/drivers/misc/mediatek/Makefile @@ -1,3 +1,3 @@ -obj-y += combo_mt66xx/ +#obj-y += combo_mt66xx/ #obj-$(CONFIG_MTK_MT6622) += mt6622/ diff --git a/drivers/misc/mediatek/combo_mt66xx/Makefile b/drivers/misc/mediatek/combo_mt66xx/Makefile index 3ec2afb7..586fc7a6 100755 --- a/drivers/misc/mediatek/combo_mt66xx/Makefile +++ b/drivers/misc/mediatek/combo_mt66xx/Makefile @@ -32,8 +32,8 @@ # have been modified by MediaTek Inc. All revisions are subject to any receiver's # applicable license agreements with MediaTek Inc. -obj-y += wmt/ -obj-y += fm/ -obj-y += bt/ -obj-y += gps/ +#obj-y += wmt/ +#obj-y += fm/ +#obj-y += bt/ +#obj-y += gps/ diff --git a/drivers/misc/mediatek/combo_mt66xx/bt/Makefile b/drivers/misc/mediatek/combo_mt66xx/bt/Makefile index 41612ef7..e94d4c72 100755 --- a/drivers/misc/mediatek/combo_mt66xx/bt/Makefile +++ b/drivers/misc/mediatek/combo_mt66xx/bt/Makefile @@ -37,5 +37,5 @@ # Makefile for the Linux Bluetooth HCI device drivers. # -obj-y += uhid/ +#obj-y += uhid/ diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 0d3ad65d..2dccc5a9 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -66,4 +66,4 @@ obj-$(CONFIG_SPI_XILINX) += spi-xilinx.o #WMT proprietary SPI driver obj-$(CONFIG_WMT_NEWSPI_SUPPORT) += wmt_spi.o obj-$(CONFIG_WMT_NEWSPI1_SUPPORT) += wmt_spi_1.o -obj-$(CONFIG_WMT_SPISLAVE1_SUPPORT) += wmt_spislave.o +#obj-$(CONFIG_WMT_SPISLAVE1_SUPPORT) += wmt_spislave.o diff --git a/include/linux/wmt-mb.h b/include/linux/wmt-mb.h index c5f3ae84..8c1a48d7 100755 --- a/include/linux/wmt-mb.h +++ b/include/linux/wmt-mb.h @@ -1,19 +1,19 @@ -/*++ - * WonderMedia Memory Block driver +/*++ + * WonderMedia Memory Block driver * * Copyright c 2010 WonderMedia Technologies, Inc. * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * * WonderMedia Technologies, Inc. @@ -67,27 +67,30 @@ int mb_do_put(unsigned long, pid_t, char *); int mb_do_counter(unsigned long, char *); int user_to_prdt( - unsigned long user, - unsigned int size, + unsigned long user, + unsigned int size, struct prdt_struct *next, unsigned int items); unsigned int wmt_mmu_table_size(unsigned int size); void wmt_mmu_table_dump(struct mmu_table_info *info); +// To fix framebuffer build issue +#if 0 int wmt_mmu_table_check( - unsigned int mmuPhys, + unsigned int mmuPhys, unsigned int mmuSize, unsigned int size); unsigned int wmt_mmu_table_from_phys( - unsigned int mmuPhys, + unsigned int mmuPhys, unsigned int mmuSize, unsigned int addr, unsigned int size); unsigned int wmt_mmu_table_from_user( - unsigned int mmuPhys, + unsigned int mmuPhys, unsigned int mmuSize, unsigned int user, unsigned int size); +#endif unsigned int wmt_mmu_table_create( unsigned int addr, unsigned int size, |