diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-13 19:14:41 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-13 19:14:41 +1000 |
| commit | d835f82b0645d1ad1ef1786b09596c050fce1515 (patch) | |
| tree | 19149d151773ebc6600d60272f42a24bea25d0f2 /arch/arm/configs/mps2_defconfig | |
| parent | c03156f8d8b7420c9c53d5d37b5c1696a931cb6e (diff) | |
| parent | 74a3bdaf209127a7895aec49bf399af2c3dc27b7 (diff) | |
| download | linux-next-d835f82b0645d1ad1ef1786b09596c050fce1515.tar.gz | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/arm/configs/mps2_defconfig')
| -rw-r--r-- | arch/arm/configs/mps2_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/mps2_defconfig b/arch/arm/configs/mps2_defconfig index 1d923dbb9928..89f4a6ff30bd 100644 --- a/arch/arm/configs/mps2_defconfig +++ b/arch/arm/configs/mps2_defconfig @@ -69,7 +69,6 @@ CONFIG_SMSC911X=y # CONFIG_VT is not set # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_NONSTANDARD=y -# CONFIG_DEVKMEM is not set CONFIG_SERIAL_MPS2_UART_CONSOLE=y CONFIG_SERIAL_MPS2_UART=y # CONFIG_HW_RANDOM is not set |