diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2010-08-14 04:20:19 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2010-08-14 16:26:51 -0400 |
commit | bf56fba6703592149e1bcd19220c60eb42dff9b7 (patch) | |
tree | 45908384005037b96ef4561345ded09da1798f14 | |
parent | 60641aa1f379820e99ac7f45a38b43795670c741 (diff) |
archs: replace unifdef-y with header-y
unifdef-y and header-y have same semantic, so drop unifdef-y
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r-- | arch/alpha/include/asm/Kbuild | 11 | ||||
-rw-r--r-- | arch/arm/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/blackfin/include/asm/Kbuild | 4 | ||||
-rw-r--r-- | arch/cris/include/asm/Kbuild | 5 | ||||
-rw-r--r-- | arch/frv/include/asm/Kbuild | 3 | ||||
-rw-r--r-- | arch/ia64/include/asm/Kbuild | 9 | ||||
-rw-r--r-- | arch/parisc/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/powerpc/include/asm/Kbuild | 53 | ||||
-rw-r--r-- | arch/s390/include/asm/Kbuild | 11 | ||||
-rw-r--r-- | arch/sh/include/asm/Kbuild | 9 | ||||
-rw-r--r-- | arch/x86/include/asm/Kbuild | 29 |
11 files changed, 65 insertions, 73 deletions
diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild index b7c8f188b313..e423defed91e 100644 --- a/arch/alpha/include/asm/Kbuild +++ b/arch/alpha/include/asm/Kbuild | |||
@@ -1,11 +1,10 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | 2 | ||
3 | header-y += compiler.h | ||
4 | header-y += console.h | ||
5 | header-y += fpu.h | ||
3 | header-y += gentrap.h | 6 | header-y += gentrap.h |
4 | header-y += regdef.h | ||
5 | header-y += pal.h | 7 | header-y += pal.h |
6 | header-y += reg.h | 8 | header-y += reg.h |
7 | 9 | header-y += regdef.h | |
8 | unifdef-y += console.h | 10 | header-y += sysinfo.h |
9 | unifdef-y += fpu.h | ||
10 | unifdef-y += sysinfo.h | ||
11 | unifdef-y += compiler.h | ||
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild index 73237bd130a2..6550db3aa5c7 100644 --- a/arch/arm/include/asm/Kbuild +++ b/arch/arm/include/asm/Kbuild | |||
@@ -1,3 +1,3 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | 2 | ||
3 | unifdef-y += hwcap.h | 3 | header-y += hwcap.h |
diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild index 09c31418cc08..d9eb29e2555c 100644 --- a/arch/blackfin/include/asm/Kbuild +++ b/arch/blackfin/include/asm/Kbuild | |||
@@ -1,4 +1,4 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | 2 | ||
3 | unifdef-y += bfin_sport.h | 3 | header-y += bfin_sport.h |
4 | unifdef-y += fixed_code.h | 4 | header-y += fixed_code.h |
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index d5b631935ec8..956eea246b97 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild | |||
@@ -4,8 +4,7 @@ header-y += arch-v10/ | |||
4 | header-y += arch-v32/ | 4 | header-y += arch-v32/ |
5 | 5 | ||
6 | header-y += ethernet.h | 6 | header-y += ethernet.h |
7 | header-y += etraxgpio.h | ||
8 | header-y += rs485.h | ||
7 | header-y += rtc.h | 9 | header-y += rtc.h |
8 | header-y += sync_serial.h | 10 | header-y += sync_serial.h |
9 | |||
10 | unifdef-y += etraxgpio.h | ||
11 | unifdef-y += rs485.h | ||
diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild index 0f8956def738..5be6663cfee5 100644 --- a/arch/frv/include/asm/Kbuild +++ b/arch/frv/include/asm/Kbuild | |||
@@ -1,5 +1,4 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | 2 | ||
3 | header-y += registers.h | 3 | header-y += registers.h |
4 | 4 | header-y += termios.h | |
5 | unifdef-y += termios.h | ||
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild index c7d0a71b9242..241d1c53ba69 100644 --- a/arch/ia64/include/asm/Kbuild +++ b/arch/ia64/include/asm/Kbuild | |||
@@ -2,14 +2,13 @@ include include/asm-generic/Kbuild.asm | |||
2 | 2 | ||
3 | header-y += break.h | 3 | header-y += break.h |
4 | header-y += fpu.h | 4 | header-y += fpu.h |
5 | header-y += gcc_intrin.h | ||
5 | header-y += ia64regs.h | 6 | header-y += ia64regs.h |
6 | header-y += intel_intrin.h | 7 | header-y += intel_intrin.h |
8 | header-y += intrinsics.h | ||
9 | header-y += perfmon.h | ||
7 | header-y += perfmon_default_smpl.h | 10 | header-y += perfmon_default_smpl.h |
8 | header-y += ptrace_offsets.h | 11 | header-y += ptrace_offsets.h |
9 | header-y += rse.h | 12 | header-y += rse.h |
10 | header-y += ucontext.h | 13 | header-y += ucontext.h |
11 | 14 | header-y += ustack.h | |
12 | unifdef-y += gcc_intrin.h | ||
13 | unifdef-y += intrinsics.h | ||
14 | unifdef-y += perfmon.h | ||
15 | unifdef-y += ustack.h | ||
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild index f88b252e419c..19a434f55059 100644 --- a/arch/parisc/include/asm/Kbuild +++ b/arch/parisc/include/asm/Kbuild | |||
@@ -1,3 +1,3 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | 2 | ||
3 | unifdef-y += pdc.h | 3 | header-y += pdc.h |
diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild index 5ab7d7fe198c..d51df17c7e6f 100644 --- a/arch/powerpc/include/asm/Kbuild +++ b/arch/powerpc/include/asm/Kbuild | |||
@@ -1,37 +1,36 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | 2 | ||
3 | header-y += auxvec.h | 3 | header-y += auxvec.h |
4 | header-y += ioctls.h | 4 | header-y += bootx.h |
5 | header-y += sembuf.h | 5 | header-y += byteorder.h |
6 | header-y += siginfo.h | 6 | header-y += cputable.h |
7 | header-y += stat.h | 7 | header-y += elf.h |
8 | header-y += errno.h | 8 | header-y += errno.h |
9 | header-y += ipcbuf.h | ||
10 | header-y += msgbuf.h | ||
11 | header-y += shmbuf.h | ||
12 | header-y += socket.h | ||
13 | header-y += termbits.h | ||
14 | header-y += fcntl.h | 9 | header-y += fcntl.h |
15 | header-y += poll.h | ||
16 | header-y += sockios.h | ||
17 | header-y += ucontext.h | ||
18 | header-y += ioctl.h | 10 | header-y += ioctl.h |
11 | header-y += ioctls.h | ||
12 | header-y += ipcbuf.h | ||
19 | header-y += linkage.h | 13 | header-y += linkage.h |
14 | header-y += msgbuf.h | ||
15 | header-y += nvram.h | ||
16 | header-y += param.h | ||
17 | header-y += poll.h | ||
18 | header-y += posix_types.h | ||
19 | header-y += ps3fb.h | ||
20 | header-y += resource.h | 20 | header-y += resource.h |
21 | header-y += seccomp.h | ||
22 | header-y += sembuf.h | ||
23 | header-y += shmbuf.h | ||
21 | header-y += sigcontext.h | 24 | header-y += sigcontext.h |
25 | header-y += siginfo.h | ||
26 | header-y += signal.h | ||
27 | header-y += socket.h | ||
28 | header-y += sockios.h | ||
29 | header-y += spu_info.h | ||
30 | header-y += stat.h | ||
22 | header-y += statfs.h | 31 | header-y += statfs.h |
23 | header-y += ps3fb.h | 32 | header-y += termbits.h |
24 | 33 | header-y += termios.h | |
25 | unifdef-y += bootx.h | 34 | header-y += types.h |
26 | unifdef-y += byteorder.h | 35 | header-y += ucontext.h |
27 | unifdef-y += cputable.h | 36 | header-y += unistd.h |
28 | unifdef-y += elf.h | ||
29 | unifdef-y += nvram.h | ||
30 | unifdef-y += param.h | ||
31 | unifdef-y += posix_types.h | ||
32 | unifdef-y += seccomp.h | ||
33 | unifdef-y += signal.h | ||
34 | unifdef-y += spu_info.h | ||
35 | unifdef-y += termios.h | ||
36 | unifdef-y += types.h | ||
37 | unifdef-y += unistd.h | ||
diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild index 63a23415fba6..42e512ba8b43 100644 --- a/arch/s390/include/asm/Kbuild +++ b/arch/s390/include/asm/Kbuild | |||
@@ -1,15 +1,14 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | 2 | ||
3 | header-y += chpid.h | ||
4 | header-y += chsc.h | ||
5 | header-y += cmb.h | ||
3 | header-y += dasd.h | 6 | header-y += dasd.h |
7 | header-y += debug.h | ||
4 | header-y += monwriter.h | 8 | header-y += monwriter.h |
5 | header-y += qeth.h | 9 | header-y += qeth.h |
10 | header-y += schid.h | ||
6 | header-y += tape390.h | 11 | header-y += tape390.h |
7 | header-y += ucontext.h | 12 | header-y += ucontext.h |
8 | header-y += vtoc.h | 13 | header-y += vtoc.h |
9 | header-y += zcrypt.h | 14 | header-y += zcrypt.h |
10 | header-y += chsc.h | ||
11 | |||
12 | unifdef-y += cmb.h | ||
13 | unifdef-y += debug.h | ||
14 | unifdef-y += chpid.h | ||
15 | unifdef-y += schid.h | ||
diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild index 46cb93477bcb..0eed47b236ab 100644 --- a/arch/sh/include/asm/Kbuild +++ b/arch/sh/include/asm/Kbuild | |||
@@ -3,8 +3,7 @@ include include/asm-generic/Kbuild.asm | |||
3 | header-y += cachectl.h | 3 | header-y += cachectl.h |
4 | header-y += cpu-features.h | 4 | header-y += cpu-features.h |
5 | header-y += hw_breakpoint.h | 5 | header-y += hw_breakpoint.h |
6 | 6 | header-y += posix_types_32.h | |
7 | unifdef-y += unistd_32.h | 7 | header-y += posix_types_64.h |
8 | unifdef-y += unistd_64.h | 8 | header-y += unistd_32.h |
9 | unifdef-y += posix_types_32.h | 9 | header-y += unistd_64.h |
10 | unifdef-y += posix_types_64.h | ||
diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild index 493092efaa3b..6fa90a845e4c 100644 --- a/arch/x86/include/asm/Kbuild +++ b/arch/x86/include/asm/Kbuild | |||
@@ -3,24 +3,23 @@ include include/asm-generic/Kbuild.asm | |||
3 | header-y += boot.h | 3 | header-y += boot.h |
4 | header-y += bootparam.h | 4 | header-y += bootparam.h |
5 | header-y += debugreg.h | 5 | header-y += debugreg.h |
6 | header-y += e820.h | ||
7 | header-y += hw_breakpoint.h | ||
8 | header-y += hyperv.h | ||
9 | header-y += ist.h | ||
6 | header-y += ldt.h | 10 | header-y += ldt.h |
11 | header-y += mce.h | ||
7 | header-y += msr-index.h | 12 | header-y += msr-index.h |
13 | header-y += msr.h | ||
14 | header-y += mtrr.h | ||
15 | header-y += posix_types_32.h | ||
16 | header-y += posix_types_64.h | ||
8 | header-y += prctl.h | 17 | header-y += prctl.h |
18 | header-y += processor-flags.h | ||
9 | header-y += ptrace-abi.h | 19 | header-y += ptrace-abi.h |
10 | header-y += sigcontext32.h | 20 | header-y += sigcontext32.h |
11 | header-y += ucontext.h | 21 | header-y += ucontext.h |
12 | header-y += processor-flags.h | 22 | header-y += unistd_32.h |
13 | header-y += hw_breakpoint.h | 23 | header-y += unistd_64.h |
14 | header-y += hyperv.h | 24 | header-y += vm86.h |
15 | 25 | header-y += vsyscall.h | |
16 | unifdef-y += e820.h | ||
17 | unifdef-y += ist.h | ||
18 | unifdef-y += mce.h | ||
19 | unifdef-y += msr.h | ||
20 | unifdef-y += mtrr.h | ||
21 | unifdef-y += posix_types_32.h | ||
22 | unifdef-y += posix_types_64.h | ||
23 | unifdef-y += unistd_32.h | ||
24 | unifdef-y += unistd_64.h | ||
25 | unifdef-y += vm86.h | ||
26 | unifdef-y += vsyscall.h | ||