diff options
author | Jon Medhurst <tixy@linaro.org> | 2014-04-15 11:51:19 +0100 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2014-04-15 11:51:19 +0100 |
commit | 9b3bf8cffaec58256681bad7682ec201fd41f3d3 (patch) | |
tree | 11cc064b6de7023a857dcb3fd8be2b29f9c34f74 /linaro | |
parent | cd3428916381f1b160cd062827092337e80d5a08 (diff) | |
parent | 5d492c0fc489ac6d0a95a8ed092ec86a0b4bdd16 (diff) |
Merge branch 'tracking-armlt-juno' into integration-linaro-vexpress
Conflicts:
arch/arm64/kernel/debug-monitors.c
Diffstat (limited to 'linaro')
-rw-r--r-- | linaro/configs/juno.conf | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/linaro/configs/juno.conf b/linaro/configs/juno.conf new file mode 100644 index 00000000000..b5ae106cd5e --- /dev/null +++ b/linaro/configs/juno.conf @@ -0,0 +1,18 @@ +CONFIG_COMPAT=y +CONFIG_SMSC911X=y +CONFIG_INPUT_EVDEV=y +CONFIG_SERIO_AMBAKMI=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_I2C=y +CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_USB_HIDDEV=y +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_USB_STORAGE=y +CONFIG_USB=y +CONFIG_USB_ULPI=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_SYNOPSYS=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_OHCI_HCD=y |