diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-12-11 05:01:53 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-12-11 05:01:53 -0500 |
| commit | 0fa5d3996dbda1ee9653c43d39b7ef159fb57ee7 (patch) | |
| tree | 70f0adc3b86bb1511be6607c959506f6365fc2a9 /arch/arm/include/asm/Kbuild | |
| parent | 0b99cb73105f0527c1c4096960796b8772343a39 (diff) | |
| parent | 14318efb322e2fe1a034c69463d725209eb9d548 (diff) | |
Merge branch 'devel-stable' into for-linus
Diffstat (limited to 'arch/arm/include/asm/Kbuild')
| -rw-r--r-- | arch/arm/include/asm/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild index f70ae175a3d6..2ffdaacd461c 100644 --- a/arch/arm/include/asm/Kbuild +++ b/arch/arm/include/asm/Kbuild | |||
| @@ -16,7 +16,6 @@ generic-y += local64.h | |||
| 16 | generic-y += msgbuf.h | 16 | generic-y += msgbuf.h |
| 17 | generic-y += param.h | 17 | generic-y += param.h |
| 18 | generic-y += parport.h | 18 | generic-y += parport.h |
| 19 | generic-y += percpu.h | ||
| 20 | generic-y += poll.h | 19 | generic-y += poll.h |
| 21 | generic-y += resource.h | 20 | generic-y += resource.h |
| 22 | generic-y += sections.h | 21 | generic-y += sections.h |