diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-09 14:14:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-09 14:14:20 -0500 |
commit | 451688ba0b488faf274e13dc591734b1e695642c (patch) | |
tree | 7d746efef856c1897697c30e2486317e823e727d | |
parent | acac103e2d00c9bc7507838319c71a0f5dc50678 (diff) | |
parent | ed2c9fa53b7a3e240a64e6e97494d72d0f80eed0 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
Kbuild: Fix deb-pkg target to work with kernel versions ending with -<text-without-digit>
ide: introduce HAVE_IDE
kbuild: silence CHK/UPD messages according to $(quiet)
scsi: fix makefile for aic7(3*x)
kbuild/modpost: Use warn() for announcing section mismatches
Add binoffset to gitignore
kbuild/modpost: improve warnings if symbol is unknown
-rw-r--r-- | arch/alpha/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/Kconfig | 19 | ||||
-rw-r--r-- | arch/avr32/Kconfig | 1 | ||||
-rw-r--r-- | arch/blackfin/Kconfig | 1 | ||||
-rw-r--r-- | arch/cris/Kconfig | 1 | ||||
-rw-r--r-- | arch/frv/Kconfig | 1 | ||||
-rw-r--r-- | arch/h8300/Kconfig | 1 | ||||
-rw-r--r-- | arch/ia64/Kconfig | 1 | ||||
-rw-r--r-- | arch/m32r/Kconfig | 1 | ||||
-rw-r--r-- | arch/m68k/Kconfig | 1 | ||||
-rw-r--r-- | arch/m68knommu/Kconfig | 1 | ||||
-rw-r--r-- | arch/mips/Kconfig | 1 | ||||
-rw-r--r-- | arch/parisc/Kconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/Kconfig | 1 | ||||
-rw-r--r-- | arch/ppc/Kconfig | 1 | ||||
-rw-r--r-- | arch/sh/Kconfig | 1 | ||||
-rw-r--r-- | arch/sparc/Kconfig | 1 | ||||
-rw-r--r-- | arch/sparc64/Kconfig | 1 | ||||
-rw-r--r-- | arch/v850/Kconfig | 1 | ||||
-rw-r--r-- | arch/x86/Kconfig | 1 | ||||
-rw-r--r-- | arch/xtensa/Kconfig | 1 | ||||
-rw-r--r-- | drivers/ide/Kconfig | 6 | ||||
-rw-r--r-- | drivers/pcmcia/Kconfig | 1 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/Makefile | 4 | ||||
-rw-r--r-- | init/Makefile | 4 | ||||
-rw-r--r-- | scripts/.gitignore | 1 | ||||
-rw-r--r-- | scripts/Kbuild.include | 8 | ||||
-rw-r--r-- | scripts/mod/modpost.c | 37 | ||||
-rw-r--r-- | scripts/package/builddeb | 3 |
29 files changed, 76 insertions, 27 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 5b7dcd5a0e75..002703b8c0b0 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig | |||
@@ -5,6 +5,7 @@ | |||
5 | config ALPHA | 5 | config ALPHA |
6 | bool | 6 | bool |
7 | default y | 7 | default y |
8 | select HAVE_IDE | ||
8 | select HAVE_OPROFILE | 9 | select HAVE_OPROFILE |
9 | help | 10 | help |
10 | The Alpha is a 64-bit general-purpose processor designed and | 11 | The Alpha is a 64-bit general-purpose processor designed and |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4127af93c5f3..9619c43783ff 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -222,6 +222,7 @@ config ARCH_CLPS7500 | |||
222 | select TIMER_ACORN | 222 | select TIMER_ACORN |
223 | select ISA | 223 | select ISA |
224 | select NO_IOPORT | 224 | select NO_IOPORT |
225 | select HAVE_IDE | ||
225 | help | 226 | help |
226 | Support for the Cirrus Logic PS7500FE system-on-a-chip. | 227 | Support for the Cirrus Logic PS7500FE system-on-a-chip. |
227 | 228 | ||
@@ -234,6 +235,7 @@ config ARCH_CO285 | |||
234 | bool "Co-EBSA285" | 235 | bool "Co-EBSA285" |
235 | select FOOTBRIDGE | 236 | select FOOTBRIDGE |
236 | select FOOTBRIDGE_ADDIN | 237 | select FOOTBRIDGE_ADDIN |
238 | select HAVE_IDE | ||
237 | help | 239 | help |
238 | Support for Intel's EBSA285 companion chip. | 240 | Support for Intel's EBSA285 companion chip. |
239 | 241 | ||
@@ -258,6 +260,7 @@ config ARCH_EP93XX | |||
258 | config ARCH_FOOTBRIDGE | 260 | config ARCH_FOOTBRIDGE |
259 | bool "FootBridge" | 261 | bool "FootBridge" |
260 | select FOOTBRIDGE | 262 | select FOOTBRIDGE |
263 | select HAVE_IDE | ||
261 | help | 264 | help |
262 | Support for systems based on the DC21285 companion chip | 265 | Support for systems based on the DC21285 companion chip |
263 | ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. | 266 | ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. |
@@ -296,6 +299,7 @@ config ARCH_IOP32X | |||
296 | depends on MMU | 299 | depends on MMU |
297 | select PLAT_IOP | 300 | select PLAT_IOP |
298 | select PCI | 301 | select PCI |
302 | select HAVE_IDE | ||
299 | help | 303 | help |
300 | Support for Intel's 80219 and IOP32X (XScale) family of | 304 | Support for Intel's 80219 and IOP32X (XScale) family of |
301 | processors. | 305 | processors. |
@@ -305,12 +309,14 @@ config ARCH_IOP33X | |||
305 | depends on MMU | 309 | depends on MMU |
306 | select PLAT_IOP | 310 | select PLAT_IOP |
307 | select PCI | 311 | select PCI |
312 | select HAVE_IDE | ||
308 | help | 313 | help |
309 | Support for Intel's IOP33X (XScale) family of processors. | 314 | Support for Intel's IOP33X (XScale) family of processors. |
310 | 315 | ||
311 | config ARCH_IXP23XX | 316 | config ARCH_IXP23XX |
312 | bool "IXP23XX-based" | 317 | bool "IXP23XX-based" |
313 | depends on MMU | 318 | depends on MMU |
319 | select HAVE_IDE | ||
314 | select PCI | 320 | select PCI |
315 | help | 321 | help |
316 | Support for Intel's IXP23xx (XScale) family of processors. | 322 | Support for Intel's IXP23xx (XScale) family of processors. |
@@ -328,12 +334,14 @@ config ARCH_IXP4XX | |||
328 | select GENERIC_GPIO | 334 | select GENERIC_GPIO |
329 | select GENERIC_TIME | 335 | select GENERIC_TIME |
330 | select GENERIC_CLOCKEVENTS | 336 | select GENERIC_CLOCKEVENTS |
337 | select HAVE_IDE | ||
331 | help | 338 | help |
332 | Support for Intel's IXP4XX (XScale) family of processors. | 339 | Support for Intel's IXP4XX (XScale) family of processors. |
333 | 340 | ||
334 | config ARCH_L7200 | 341 | config ARCH_L7200 |
335 | bool "LinkUp-L7200" | 342 | bool "LinkUp-L7200" |
336 | select FIQ | 343 | select FIQ |
344 | select HAVE_IDE | ||
337 | help | 345 | help |
338 | Say Y here if you intend to run this kernel on a LinkUp Systems | 346 | Say Y here if you intend to run this kernel on a LinkUp Systems |
339 | L7200 Software Development Board which uses an ARM720T processor. | 347 | L7200 Software Development Board which uses an ARM720T processor. |
@@ -388,6 +396,7 @@ config ARCH_PXA | |||
388 | depends on MMU | 396 | depends on MMU |
389 | select ARCH_MTD_XIP | 397 | select ARCH_MTD_XIP |
390 | select GENERIC_GPIO | 398 | select GENERIC_GPIO |
399 | select HAVE_IDE | ||
391 | select HAVE_GPIO_LIB | 400 | select HAVE_GPIO_LIB |
392 | select GENERIC_TIME | 401 | select GENERIC_TIME |
393 | select GENERIC_CLOCKEVENTS | 402 | select GENERIC_CLOCKEVENTS |
@@ -403,6 +412,7 @@ config ARCH_RPC | |||
403 | select ARCH_MAY_HAVE_PC_FDC | 412 | select ARCH_MAY_HAVE_PC_FDC |
404 | select ISA_DMA_API | 413 | select ISA_DMA_API |
405 | select NO_IOPORT | 414 | select NO_IOPORT |
415 | select HAVE_IDE | ||
406 | help | 416 | help |
407 | On the Acorn Risc-PC, Linux can support the internal IDE disk and | 417 | On the Acorn Risc-PC, Linux can support the internal IDE disk and |
408 | CD-ROM interface, serial and parallel port, and the floppy drive. | 418 | CD-ROM interface, serial and parallel port, and the floppy drive. |
@@ -414,12 +424,14 @@ config ARCH_SA1100 | |||
414 | select ARCH_MTD_XIP | 424 | select ARCH_MTD_XIP |
415 | select GENERIC_GPIO | 425 | select GENERIC_GPIO |
416 | select GENERIC_TIME | 426 | select GENERIC_TIME |
427 | select HAVE_IDE | ||
417 | help | 428 | help |
418 | Support for StrongARM 11x0 based boards. | 429 | Support for StrongARM 11x0 based boards. |
419 | 430 | ||
420 | config ARCH_S3C2410 | 431 | config ARCH_S3C2410 |
421 | bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443" | 432 | bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443" |
422 | select GENERIC_GPIO | 433 | select GENERIC_GPIO |
434 | select HAVE_IDE | ||
423 | help | 435 | help |
424 | Samsung S3C2410X CPU based systems, such as the Simtec Electronics | 436 | Samsung S3C2410X CPU based systems, such as the Simtec Electronics |
425 | BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or | 437 | BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or |
@@ -427,6 +439,7 @@ config ARCH_S3C2410 | |||
427 | 439 | ||
428 | config ARCH_SHARK | 440 | config ARCH_SHARK |
429 | bool "Shark" | 441 | bool "Shark" |
442 | select HAVE_IDE | ||
430 | select ISA | 443 | select ISA |
431 | select ISA_DMA | 444 | select ISA_DMA |
432 | select PCI | 445 | select PCI |
@@ -436,6 +449,7 @@ config ARCH_SHARK | |||
436 | 449 | ||
437 | config ARCH_LH7A40X | 450 | config ARCH_LH7A40X |
438 | bool "Sharp LH7A40X" | 451 | bool "Sharp LH7A40X" |
452 | select HAVE_IDE | ||
439 | help | 453 | help |
440 | Say Y here for systems based on one of the Sharp LH7A40X | 454 | Say Y here for systems based on one of the Sharp LH7A40X |
441 | System on a Chip processors. These CPUs include an ARM922T | 455 | System on a Chip processors. These CPUs include an ARM922T |
@@ -1093,12 +1107,7 @@ source "drivers/block/Kconfig" | |||
1093 | 1107 | ||
1094 | source "drivers/misc/Kconfig" | 1108 | source "drivers/misc/Kconfig" |
1095 | 1109 | ||
1096 | if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \ | ||
1097 | || ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \ | ||
1098 | || ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \ | ||
1099 | || ARCH_IXP23XX | ||
1100 | source "drivers/ide/Kconfig" | 1110 | source "drivers/ide/Kconfig" |
1101 | endif | ||
1102 | 1111 | ||
1103 | source "drivers/scsi/Kconfig" | 1112 | source "drivers/scsi/Kconfig" |
1104 | 1113 | ||
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index 28e0caf4156c..c75d7089f982 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig | |||
@@ -10,6 +10,7 @@ config AVR32 | |||
10 | # With EMBEDDED=n, we get lots of stuff automatically selected | 10 | # With EMBEDDED=n, we get lots of stuff automatically selected |
11 | # that we usually don't need on AVR32. | 11 | # that we usually don't need on AVR32. |
12 | select EMBEDDED | 12 | select EMBEDDED |
13 | select HAVE_IDE | ||
13 | select HAVE_OPROFILE | 14 | select HAVE_OPROFILE |
14 | select HAVE_KPROBES | 15 | select HAVE_KPROBES |
15 | help | 16 | help |
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 368bc7fe167e..589c6aca4803 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -24,6 +24,7 @@ config RWSEM_XCHGADD_ALGORITHM | |||
24 | config BLACKFIN | 24 | config BLACKFIN |
25 | bool | 25 | bool |
26 | default y | 26 | default y |
27 | select HAVE_IDE | ||
27 | select HAVE_OPROFILE | 28 | select HAVE_OPROFILE |
28 | 29 | ||
29 | config ZONE_DMA | 30 | config ZONE_DMA |
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 8456bc8efb7c..9389d38f222f 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
@@ -54,6 +54,7 @@ config FORCE_MAX_ZONEORDER | |||
54 | config CRIS | 54 | config CRIS |
55 | bool | 55 | bool |
56 | default y | 56 | default y |
57 | select HAVE_IDE | ||
57 | 58 | ||
58 | config HZ | 59 | config HZ |
59 | int | 60 | int |
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index 9e561ede0925..a5aac1b07562 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig | |||
@@ -5,6 +5,7 @@ | |||
5 | config FRV | 5 | config FRV |
6 | bool | 6 | bool |
7 | default y | 7 | default y |
8 | select HAVE_IDE | ||
8 | 9 | ||
9 | config ZONE_DMA | 10 | config ZONE_DMA |
10 | bool | 11 | bool |
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index f69e5ea38558..085dc6ec152b 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig | |||
@@ -8,6 +8,7 @@ mainmenu "uClinux/h8300 (w/o MMU) Kernel Configuration" | |||
8 | config H8300 | 8 | config H8300 |
9 | bool | 9 | bool |
10 | default y | 10 | default y |
11 | select HAVE_IDE | ||
11 | 12 | ||
12 | config MMU | 13 | config MMU |
13 | bool | 14 | bool |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index b0de1132dfc0..2d4fcd01bc91 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -15,6 +15,7 @@ config IA64 | |||
15 | select ACPI if (!IA64_HP_SIM) | 15 | select ACPI if (!IA64_HP_SIM) |
16 | select PM if (!IA64_HP_SIM) | 16 | select PM if (!IA64_HP_SIM) |
17 | select ARCH_SUPPORTS_MSI | 17 | select ARCH_SUPPORTS_MSI |
18 | select HAVE_IDE | ||
18 | select HAVE_OPROFILE | 19 | select HAVE_OPROFILE |
19 | select HAVE_KPROBES | 20 | select HAVE_KPROBES |
20 | default y | 21 | default y |
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index d4679ab55b96..de153de2ea9f 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
@@ -8,6 +8,7 @@ mainmenu "Linux/M32R Kernel Configuration" | |||
8 | config M32R | 8 | config M32R |
9 | bool | 9 | bool |
10 | default y | 10 | default y |
11 | select HAVE_IDE | ||
11 | select HAVE_OPROFILE | 12 | select HAVE_OPROFILE |
12 | 13 | ||
13 | config SBUS | 14 | config SBUS |
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 2b0ed89cd173..65db2261b9ea 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig | |||
@@ -5,6 +5,7 @@ | |||
5 | config M68K | 5 | config M68K |
6 | bool | 6 | bool |
7 | default y | 7 | default y |
8 | select HAVE_IDE | ||
8 | 9 | ||
9 | config MMU | 10 | config MMU |
10 | bool | 11 | bool |
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index 548a7b321633..07eb4c4bab82 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig | |||
@@ -8,6 +8,7 @@ mainmenu "uClinux/68k (w/o MMU) Kernel Configuration" | |||
8 | config M68K | 8 | config M68K |
9 | bool | 9 | bool |
10 | default y | 10 | default y |
11 | select HAVE_IDE | ||
11 | 12 | ||
12 | config MMU | 13 | config MMU |
13 | bool | 14 | bool |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index ec78a5762e9e..ade230d445d9 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -1,6 +1,7 @@ | |||
1 | config MIPS | 1 | config MIPS |
2 | bool | 2 | bool |
3 | default y | 3 | default y |
4 | select HAVE_IDE | ||
4 | select HAVE_OPROFILE | 5 | select HAVE_OPROFILE |
5 | # Horrible source of confusion. Die, die, die ... | 6 | # Horrible source of confusion. Die, die, die ... |
6 | select EMBEDDED | 7 | select EMBEDDED |
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index d929ac84f25a..bc7a19da6245 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
@@ -7,6 +7,7 @@ mainmenu "Linux/PA-RISC Kernel Configuration" | |||
7 | 7 | ||
8 | config PARISC | 8 | config PARISC |
9 | def_bool y | 9 | def_bool y |
10 | select HAVE_IDE | ||
10 | select HAVE_OPROFILE | 11 | select HAVE_OPROFILE |
11 | help | 12 | help |
12 | The PA-RISC microprocessor is designed by Hewlett-Packard and used | 13 | The PA-RISC microprocessor is designed by Hewlett-Packard and used |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 26b963c33c88..485513c9f1af 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -87,6 +87,7 @@ config ARCH_NO_VIRT_TO_BUS | |||
87 | config PPC | 87 | config PPC |
88 | bool | 88 | bool |
89 | default y | 89 | default y |
90 | select HAVE_IDE | ||
90 | select HAVE_OPROFILE | 91 | select HAVE_OPROFILE |
91 | select HAVE_KPROBES | 92 | select HAVE_KPROBES |
92 | 93 | ||
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 531156f8919c..abc877faf123 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -42,6 +42,7 @@ config GENERIC_CALIBRATE_DELAY | |||
42 | config PPC | 42 | config PPC |
43 | bool | 43 | bool |
44 | default y | 44 | default y |
45 | select HAVE_IDE | ||
45 | select HAVE_OPROFILE | 46 | select HAVE_OPROFILE |
46 | select HAVE_KPROBES | 47 | select HAVE_KPROBES |
47 | 48 | ||
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 6e035d1cf789..d87d4bf88803 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -8,6 +8,7 @@ mainmenu "Linux/SuperH Kernel Configuration" | |||
8 | config SUPERH | 8 | config SUPERH |
9 | def_bool y | 9 | def_bool y |
10 | select EMBEDDED | 10 | select EMBEDDED |
11 | select HAVE_IDE | ||
11 | select HAVE_OPROFILE | 12 | select HAVE_OPROFILE |
12 | help | 13 | help |
13 | The SuperH is a RISC processor targeted for use in embedded systems | 14 | The SuperH is a RISC processor targeted for use in embedded systems |
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 7c674a3503b6..c40343c54920 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -69,6 +69,7 @@ config NR_CPUS | |||
69 | config SPARC | 69 | config SPARC |
70 | bool | 70 | bool |
71 | default y | 71 | default y |
72 | select HAVE_IDE | ||
72 | select HAVE_OPROFILE | 73 | select HAVE_OPROFILE |
73 | 74 | ||
74 | # Identify this as a Sparc32 build | 75 | # Identify this as a Sparc32 build |
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index b810f2b7526a..810755637311 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
@@ -14,6 +14,7 @@ config SPARC | |||
14 | config SPARC64 | 14 | config SPARC64 |
15 | bool | 15 | bool |
16 | default y | 16 | default y |
17 | select HAVE_IDE | ||
17 | help | 18 | help |
18 | SPARC is a family of RISC microprocessors designed and marketed by | 19 | SPARC is a family of RISC microprocessors designed and marketed by |
19 | Sun Microsystems, incorporated. This port covers the newer 64-bit | 20 | Sun Microsystems, incorporated. This port covers the newer 64-bit |
diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig index 7b6d3716efca..4379f43505ef 100644 --- a/arch/v850/Kconfig +++ b/arch/v850/Kconfig | |||
@@ -78,6 +78,7 @@ config MCA | |||
78 | config V850 | 78 | config V850 |
79 | bool | 79 | bool |
80 | default y | 80 | default y |
81 | select HAVE_IDE | ||
81 | 82 | ||
82 | menu "Processor type and features" | 83 | menu "Processor type and features" |
83 | 84 | ||
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a64d532dff4c..aaed1a3b92d6 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -18,6 +18,7 @@ config X86_64 | |||
18 | ### Arch settings | 18 | ### Arch settings |
19 | config X86 | 19 | config X86 |
20 | def_bool y | 20 | def_bool y |
21 | select HAVE_IDE | ||
21 | select HAVE_OPROFILE | 22 | select HAVE_OPROFILE |
22 | select HAVE_KPROBES | 23 | select HAVE_KPROBES |
23 | 24 | ||
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index fd36764d7fb7..9fc8551a1cf6 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig | |||
@@ -14,6 +14,7 @@ config ZONE_DMA | |||
14 | config XTENSA | 14 | config XTENSA |
15 | bool | 15 | bool |
16 | default y | 16 | default y |
17 | select HAVE_IDE | ||
17 | help | 18 | help |
18 | Xtensa processors are 32-bit RISC machines designed by Tensilica | 19 | Xtensa processors are 32-bit RISC machines designed by Tensilica |
19 | primarily for embedded systems. These processors are both | 20 | primarily for embedded systems. These processors are both |
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index ab8fb257528e..043c34ad0a05 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -4,10 +4,14 @@ | |||
4 | # Andre Hedrick <andre@linux-ide.org> | 4 | # Andre Hedrick <andre@linux-ide.org> |
5 | # | 5 | # |
6 | 6 | ||
7 | # Select HAVE_IDE if IDE is supported | ||
8 | config HAVE_IDE | ||
9 | def_bool n | ||
10 | |||
7 | menuconfig IDE | 11 | menuconfig IDE |
8 | tristate "ATA/ATAPI/MFM/RLL support" | 12 | tristate "ATA/ATAPI/MFM/RLL support" |
13 | depends on HAVE_IDE | ||
9 | depends on BLOCK | 14 | depends on BLOCK |
10 | depends on HAS_IOMEM | ||
11 | ---help--- | 15 | ---help--- |
12 | If you say Y here, your kernel will be able to manage low cost mass | 16 | If you say Y here, your kernel will be able to manage low cost mass |
13 | storage units such as ATA/(E)IDE and ATAPI units. The most common | 17 | storage units such as ATA/(E)IDE and ATAPI units. The most common |
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 519b4ff79f7f..8b22281b087f 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig | |||
@@ -38,6 +38,7 @@ config PCMCIA_DEBUG | |||
38 | config PCMCIA | 38 | config PCMCIA |
39 | tristate "16-bit PCMCIA support" | 39 | tristate "16-bit PCMCIA support" |
40 | select CRC32 | 40 | select CRC32 |
41 | select HAVE_IDE | ||
41 | default y | 42 | default y |
42 | ---help--- | 43 | ---help--- |
43 | This option enables support for 16-bit PCMCIA cards. Most older | 44 | This option enables support for 16-bit PCMCIA cards. Most older |
diff --git a/drivers/scsi/aic7xxx/Makefile b/drivers/scsi/aic7xxx/Makefile index 4c549540a35d..741d81861d17 100644 --- a/drivers/scsi/aic7xxx/Makefile +++ b/drivers/scsi/aic7xxx/Makefile | |||
@@ -44,8 +44,8 @@ clean-files += aic79xx_seq.h aic79xx_reg.h aic79xx_reg_print.c | |||
44 | 44 | ||
45 | # Dependencies for generated files need to be listed explicitly | 45 | # Dependencies for generated files need to be listed explicitly |
46 | 46 | ||
47 | $(addprefix $(src)/,$(aic7xxx-y:.o=.c)): $(obj)/aic7xxx_seq.h $(obj)/aic7xxx_reg.h | 47 | $(addprefix $(obj)/,$(aic7xxx-y)): $(obj)/aic7xxx_seq.h $(obj)/aic7xxx_reg.h |
48 | $(addprefix $(src)/,$(aic79xx-y:.o=.c)): $(obj)/aic79xx_seq.h $(obj)/aic79xx_reg.h | 48 | $(addprefix $(obj)/,$(aic79xx-y)): $(obj)/aic79xx_seq.h $(obj)/aic79xx_reg.h |
49 | 49 | ||
50 | aic7xxx-gen-$(CONFIG_AIC7XXX_BUILD_FIRMWARE) := $(obj)/aic7xxx_reg.h | 50 | aic7xxx-gen-$(CONFIG_AIC7XXX_BUILD_FIRMWARE) := $(obj)/aic7xxx_reg.h |
51 | aic7xxx-gen-$(CONFIG_AIC7XXX_REG_PRETTY_PRINT) += $(obj)/aic7xxx_reg_print.c | 51 | aic7xxx-gen-$(CONFIG_AIC7XXX_REG_PRETTY_PRINT) += $(obj)/aic7xxx_reg_print.c |
diff --git a/init/Makefile b/init/Makefile index 633392f5cdee..c5f157ce293e 100644 --- a/init/Makefile +++ b/init/Makefile | |||
@@ -27,7 +27,9 @@ $(obj)/version.o: include/linux/compile.h | |||
27 | # mkcompile_h will make sure to only update the | 27 | # mkcompile_h will make sure to only update the |
28 | # actual file if its content has changed. | 28 | # actual file if its content has changed. |
29 | 29 | ||
30 | quiet_chk_compile.h = echo ' CHK $@' | ||
31 | silent_chk_compile.h = : | ||
30 | include/linux/compile.h: FORCE | 32 | include/linux/compile.h: FORCE |
31 | @echo ' CHK $@' | 33 | @$($(quiet)chk_compile.h) |
32 | $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ | 34 | $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ |
33 | "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)" | 35 | "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)" |
diff --git a/scripts/.gitignore b/scripts/.gitignore index a1f52cb47200..b939fbd01195 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore | |||
@@ -6,3 +6,4 @@ kallsyms | |||
6 | pnmtologo | 6 | pnmtologo |
7 | bin2c | 7 | bin2c |
8 | unifdef | 8 | unifdef |
9 | binoffset | ||
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index b96ea8d6a5ed..da3559ea92e0 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include | |||
@@ -39,15 +39,19 @@ escsq = $(subst $(squote),'\$(squote)',$1) | |||
39 | # - If they are equal no change, and no timestamp update | 39 | # - If they are equal no change, and no timestamp update |
40 | # - stdin is piped in from the first prerequisite ($<) so one has | 40 | # - stdin is piped in from the first prerequisite ($<) so one has |
41 | # to specify a valid file as first prerequisite (often the kbuild file) | 41 | # to specify a valid file as first prerequisite (often the kbuild file) |
42 | quiet_chk_filechk = echo ' CHK $@' | ||
43 | silent_chk_filechk = : | ||
44 | quiet_upd_filechk = echo ' UPD $@' | ||
45 | silent_upd_filechk = : | ||
42 | define filechk | 46 | define filechk |
43 | $(Q)set -e; \ | 47 | $(Q)set -e; \ |
44 | echo ' CHK $@'; \ | 48 | $($(quiet)chk_filechk); \ |
45 | mkdir -p $(dir $@); \ | 49 | mkdir -p $(dir $@); \ |
46 | $(filechk_$(1)) < $< > $@.tmp; \ | 50 | $(filechk_$(1)) < $< > $@.tmp; \ |
47 | if [ -r $@ ] && cmp -s $@ $@.tmp; then \ | 51 | if [ -r $@ ] && cmp -s $@ $@.tmp; then \ |
48 | rm -f $@.tmp; \ | 52 | rm -f $@.tmp; \ |
49 | else \ | 53 | else \ |
50 | echo ' UPD $@'; \ | 54 | $($(quiet)upd_filechk); \ |
51 | mv -f $@.tmp $@; \ | 55 | mv -f $@.tmp $@; \ |
52 | fi | 56 | fi |
53 | endef | 57 | endef |
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 5d546466e6b1..dbe1fb5e8cc0 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
@@ -613,7 +613,7 @@ static const char *sym_name(struct elf_info *elf, Elf_Sym *sym) | |||
613 | if (sym) | 613 | if (sym) |
614 | return elf->strtab + sym->st_name; | 614 | return elf->strtab + sym->st_name; |
615 | else | 615 | else |
616 | return ""; | 616 | return "(unknown)"; |
617 | } | 617 | } |
618 | 618 | ||
619 | static const char *sec_name(struct elf_info *elf, int shndx) | 619 | static const char *sec_name(struct elf_info *elf, int shndx) |
@@ -1102,7 +1102,7 @@ static int is_function(Elf_Sym *sym) | |||
1102 | if (sym) | 1102 | if (sym) |
1103 | return ELF_ST_TYPE(sym->st_info) == STT_FUNC; | 1103 | return ELF_ST_TYPE(sym->st_info) == STT_FUNC; |
1104 | else | 1104 | else |
1105 | return 0; | 1105 | return -1; |
1106 | } | 1106 | } |
1107 | 1107 | ||
1108 | /* | 1108 | /* |
@@ -1120,24 +1120,31 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, | |||
1120 | { | 1120 | { |
1121 | const char *from, *from_p; | 1121 | const char *from, *from_p; |
1122 | const char *to, *to_p; | 1122 | const char *to, *to_p; |
1123 | from = from_is_func ? "function" : "variable"; | 1123 | |
1124 | from_p = from_is_func ? "()" : ""; | 1124 | switch (from_is_func) { |
1125 | to = to_is_func ? "function" : "variable"; | 1125 | case 0: from = "variable"; from_p = ""; break; |
1126 | to_p = to_is_func ? "()" : ""; | 1126 | case 1: from = "function"; from_p = "()"; break; |
1127 | default: from = "(unknown reference)"; from_p = ""; break; | ||
1128 | } | ||
1129 | switch (to_is_func) { | ||
1130 | case 0: to = "variable"; to_p = ""; break; | ||
1131 | case 1: to = "function"; to_p = "()"; break; | ||
1132 | default: to = "(unknown reference)"; to_p = ""; break; | ||
1133 | } | ||
1127 | 1134 | ||
1128 | sec_mismatch_count++; | 1135 | sec_mismatch_count++; |
1129 | if (!sec_mismatch_verbose) | 1136 | if (!sec_mismatch_verbose) |
1130 | return; | 1137 | return; |
1131 | 1138 | ||
1132 | fprintf(stderr, "WARNING: %s(%s+0x%llx): Section mismatch in" | 1139 | warn("%s(%s+0x%llx): Section mismatch in reference from the %s %s%s " |
1133 | " reference from the %s %s%s to the %s %s:%s%s\n", | 1140 | "to the %s %s:%s%s\n", |
1134 | modname, fromsec, fromaddr, from, fromsym, from_p, | 1141 | modname, fromsec, fromaddr, from, fromsym, from_p, to, tosec, |
1135 | to, tosec, tosym, to_p); | 1142 | tosym, to_p); |
1136 | 1143 | ||
1137 | switch (mismatch) { | 1144 | switch (mismatch) { |
1138 | case TEXT_TO_INIT: | 1145 | case TEXT_TO_INIT: |
1139 | fprintf(stderr, | 1146 | fprintf(stderr, |
1140 | "The function %s %s() references\n" | 1147 | "The function %s%s() references\n" |
1141 | "the %s %s%s%s.\n" | 1148 | "the %s %s%s%s.\n" |
1142 | "This is often because %s lacks a %s\n" | 1149 | "This is often because %s lacks a %s\n" |
1143 | "annotation or the annotation of %s is wrong.\n", | 1150 | "annotation or the annotation of %s is wrong.\n", |
@@ -1938,10 +1945,10 @@ int main(int argc, char **argv) | |||
1938 | if (dump_write) | 1945 | if (dump_write) |
1939 | write_dump(dump_write); | 1946 | write_dump(dump_write); |
1940 | if (sec_mismatch_count && !sec_mismatch_verbose) | 1947 | if (sec_mismatch_count && !sec_mismatch_verbose) |
1941 | fprintf(stderr, "modpost: Found %d section mismatch(es).\n" | 1948 | warn("modpost: Found %d section mismatch(es).\n" |
1942 | "To see full details build your kernel with:\n" | 1949 | "To see full details build your kernel with:\n" |
1943 | "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n", | 1950 | "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n", |
1944 | sec_mismatch_count); | 1951 | sec_mismatch_count); |
1945 | 1952 | ||
1946 | return err; | 1953 | return err; |
1947 | } | 1954 | } |
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 0f657b5f3bc8..ba6bf5d5abf9 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb | |||
@@ -13,6 +13,7 @@ set -e | |||
13 | 13 | ||
14 | # Some variables and settings used throughout the script | 14 | # Some variables and settings used throughout the script |
15 | version=$KERNELRELEASE | 15 | version=$KERNELRELEASE |
16 | revision=`cat .version` | ||
16 | tmpdir="$objtree/debian/tmp" | 17 | tmpdir="$objtree/debian/tmp" |
17 | packagename=linux-$version | 18 | packagename=linux-$version |
18 | 19 | ||
@@ -65,7 +66,7 @@ done | |||
65 | name="Kernel Compiler <$(id -nu)@$(hostname -f)>" | 66 | name="Kernel Compiler <$(id -nu)@$(hostname -f)>" |
66 | # Generate a simple changelog template | 67 | # Generate a simple changelog template |
67 | cat <<EOF > debian/changelog | 68 | cat <<EOF > debian/changelog |
68 | linux ($version) unstable; urgency=low | 69 | linux ($version-$revision) unstable; urgency=low |
69 | 70 | ||
70 | * A standard release | 71 | * A standard release |
71 | 72 | ||