diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-05-18 20:50:43 +0300 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-05-18 20:50:43 +0300 |
| commit | 2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49 (patch) | |
| tree | 10924a4ec59c9b2d114c2287bd35e6debc72595f /arch/arm/mm/proc-arm1020e.S | |
| parent | 02787daadbdad80c9c79487b5ef8284aff734a7b (diff) | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
| download | linux-2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49.tar.xz | |
Merge tag 'v4.1-rc4' into MTD's -next
Diffstat (limited to 'arch/arm/mm/proc-arm1020e.S')
| -rw-r--r-- | arch/arm/mm/proc-arm1020e.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S index bff4c7f70fd6..ae3c27b71594 100644 --- a/arch/arm/mm/proc-arm1020e.S +++ b/arch/arm/mm/proc-arm1020e.S @@ -22,8 +22,6 @@ * * These are the low level assembler for performing cache and TLB * functions on the arm1020e. - * - * CONFIG_CPU_ARM1020_CPU_IDLE -> nohlt */ #include <linux/linkage.h> #include <linux/init.h> |