Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 12:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ux500 defconfig update for v4.7:

Browse Source 
- Remove the unused MACH_UX500_DT option from the multi_v7 defconfig
 - Remove staging driver from u8500_defconfig
 - Update sensor support in u8500_defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXMc/0AAoJEEEQszewGV1zMacQAKdlkdZgxrgtEPkadC5BYy9o
 p4BK1dEzNLbdbCvnrvoR/ubfB165If1uPFxFykqJBGpnTdpOMPWho5tgI9t2ABZz
 DzMY+HBIm36M6TeZb6q7MdYAjI2vdHHiFMVFTf5cAXlOOMO/5mCP2UhaPpbyZbt5
 /2kDNPMJPOvP1w4T866lzyNcOBYViYwVneO3HgHkElrcu1s9NCtXsSE0bYL1Ruwn
 rehd3UvnHvVDST0gfX5GW0hpKYXxga6gvdwipmcL/FL4aSBjbs5QAAvrucFbz9II
 dHtGd2nGC6hwpKutFGYWDz1vo+T9j6+NNgI2gttbGpSo6IbsAR/CgrL4rY3VMcCo
 9i8zsm6NKihSjmK+w7ECkIHuE4/6FwEQJ6wkMB1uN31R852ev5JDgPeXesimpW/D
 eWGne2642B2tVCAj4Dp7XSZ4VwhfI6ccZEXqeB7ychGHpAiI9IEnkjZ48SezN5Xf
 4RyUNBawbYoD3D7ah1bGdjIHUwfUT8ejHg+F6kRsa6SWAvTEgr4C/m3Z53ME8rdF
 arGbfBzYfR5vxvXWhYHounWSrOOHqNzHFCvAoGU5vhzbuHjVqmIv4NfVxijoyuJM
 NQ9cf6WHlRTXqWWqPtrJQT6wYDq28x7Qyua5+7Hk1m3chxVux6LzTDh7L1js4cHM
 5kP5GKAw/uVWtTS+7p4T
 =WJzV
 -----END PGP SIGNATURE-----

Merge tag 'ux500-defconfig-armsoc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/defconfig

Merge "Ux500 defconfig update for v4.7" from Linus Walleij:

- Remove the unused MACH_UX500_DT option from the multi_v7 defconfig
- Remove staging driver from u8500_defconfig
- Update sensor support in u8500_defconfig

* tag 'ux500-defconfig-armsoc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: u8500_defconfig: update sensor config
  ARM: u8500_defconfig: remove staging from defconfig
  ARM: multi_v7_defconfig: Remove unused Kconfig option MACH_UX500_DT
This commit is contained in:
Arnd Bergmann 2016-05-10 14:24:06 +02:00
commit 11d708f414
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/configs/multi_v7_defconfig
View File

@ -105,7 +105,6 @@ CONFIG_ARCH_UNIPHIER=y
CONFIG_ARCH_U8500=y
CONFIG_MACH_HREFV60=y
CONFIG_MACH_SNOWBALL=y
CONFIG_MACH_UX500_DT=y
CONFIG_ARCH_VEXPRESS=y
CONFIG_ARCH_VEXPRESS_CA9X4=y
CONFIG_ARCH_VEXPRESS_TC2_PM=y

5
arch/arm/configs/u8500_defconfig
View File

@ -45,7 +45,6 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=65536
CONFIG_SENSORS_BH1780=y
CONFIG_NETDEVICES=y
CONFIG_SMSC911X=y
CONFIG_SMSC_PHY=y
@ -104,12 +103,12 @@ CONFIG_RTC_DRV_AB8500=y
CONFIG_RTC_DRV_PL031=y
CONFIG_DMADEVICES=y
CONFIG_STE_DMA40=y
CONFIG_STAGING=y
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y
CONFIG_HSEM_U8500=y
CONFIG_IIO=y
CONFIG_IIO_BUFFER=y
CONFIG_IIO_ST_ACCEL_3AXIS=y
CONFIG_IIO_ST_GYRO_3AXIS=y
CONFIG_BH1780=y
CONFIG_IIO_ST_MAGN_3AXIS=y
CONFIG_IIO_ST_PRESS=y
CONFIG_EXT2_FS=y