diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 18:10:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 18:10:08 -0400 |
commit | cee4cca740d209bcb4b9857baa2253d5ba4e3fbe (patch) | |
tree | 88a23004393ea4a32cad79839479c8e653e401d6 /include/asm-m68knommu | |
parent | 2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6 (diff) | |
parent | 9348f0de2d2b541b4ba64fb1f4efee9710a3d731 (diff) |
Merge git://git.infradead.org/hdrcleanup-2.6
* git://git.infradead.org/hdrcleanup-2.6: (63 commits)
[S390] __FD_foo definitions.
Switch to __s32 types in joystick.h instead of C99 types for consistency.
Add <sys/types.h> to headers included for userspace in <linux/input.h>
Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
Remove struct fddi_statistics from user view in <linux/if_fddi.h>
Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>
Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too
Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>
Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>
Use __uXX types in <linux/divert.h> for struct divert_blk et al.
Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.
Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
Use __uXX types in user-visible structures in <linux/nbd.h>
Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
Use __uXX types for S390 DASD volume label definitions which are user-visible
S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>
Fix private integer types used in V4L2 ioctls.
...
Manually resolve conflict in include/linux/mtd/physmap.h
Diffstat (limited to 'include/asm-m68knommu')
40 files changed, 4 insertions, 42 deletions
diff --git a/include/asm-m68knommu/bitops.h b/include/asm-m68knommu/bitops.h index 0b68ccd327f7..d7fa7d9c0e0f 100644 --- a/include/asm-m68knommu/bitops.h +++ b/include/asm-m68knommu/bitops.h | |||
@@ -5,7 +5,6 @@ | |||
5 | * Copyright 1992, Linus Torvalds. | 5 | * Copyright 1992, Linus Torvalds. |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/config.h> | ||
9 | #include <linux/compiler.h> | 8 | #include <linux/compiler.h> |
10 | #include <asm/byteorder.h> /* swab32 */ | 9 | #include <asm/byteorder.h> /* swab32 */ |
11 | #include <asm/system.h> /* save_flags */ | 10 | #include <asm/system.h> /* save_flags */ |
diff --git a/include/asm-m68knommu/coldfire.h b/include/asm-m68knommu/coldfire.h index 6190f77b1e6c..2fabca91df83 100644 --- a/include/asm-m68knommu/coldfire.h +++ b/include/asm-m68knommu/coldfire.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #define coldfire_h | 12 | #define coldfire_h |
13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
14 | 14 | ||
15 | #include <linux/config.h> | ||
16 | 15 | ||
17 | /* | 16 | /* |
18 | * Define the processor support peripherals base address. | 17 | * Define the processor support peripherals base address. |
diff --git a/include/asm-m68knommu/commproc.h b/include/asm-m68knommu/commproc.h index e522ca8193a2..0161ebb5d883 100644 --- a/include/asm-m68knommu/commproc.h +++ b/include/asm-m68knommu/commproc.h | |||
@@ -17,7 +17,6 @@ | |||
17 | #ifndef __CPM_360__ | 17 | #ifndef __CPM_360__ |
18 | #define __CPM_360__ | 18 | #define __CPM_360__ |
19 | 19 | ||
20 | #include <linux/config.h> | ||
21 | 20 | ||
22 | /* CPM Command register masks: */ | 21 | /* CPM Command register masks: */ |
23 | #define CPM_CR_RST ((ushort)0x8000) | 22 | #define CPM_CR_RST ((ushort)0x8000) |
diff --git a/include/asm-m68knommu/dma-mapping.h b/include/asm-m68knommu/dma-mapping.h index a6c42ba48da6..5622b855a577 100644 --- a/include/asm-m68knommu/dma-mapping.h +++ b/include/asm-m68knommu/dma-mapping.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _M68KNOMMU_DMA_MAPPING_H | 1 | #ifndef _M68KNOMMU_DMA_MAPPING_H |
2 | #define _M68KNOMMU_DMA_MAPPING_H | 2 | #define _M68KNOMMU_DMA_MAPPING_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | 4 | ||
6 | #ifdef CONFIG_PCI | 5 | #ifdef CONFIG_PCI |
7 | #include <asm-generic/dma-mapping.h> | 6 | #include <asm-generic/dma-mapping.h> |
diff --git a/include/asm-m68knommu/dma.h b/include/asm-m68knommu/dma.h index 43e98c96a5c2..3338001abb40 100644 --- a/include/asm-m68knommu/dma.h +++ b/include/asm-m68knommu/dma.h | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | //#define DMA_DEBUG 1 | 4 | //#define DMA_DEBUG 1 |
5 | 5 | ||
6 | #include <linux/config.h> | ||
7 | 6 | ||
8 | #ifdef CONFIG_COLDFIRE | 7 | #ifdef CONFIG_COLDFIRE |
9 | /* | 8 | /* |
diff --git a/include/asm-m68knommu/elf.h b/include/asm-m68knommu/elf.h index 9919487703bc..40b1ed6827db 100644 --- a/include/asm-m68knommu/elf.h +++ b/include/asm-m68knommu/elf.h | |||
@@ -5,7 +5,6 @@ | |||
5 | * ELF register definitions.. | 5 | * ELF register definitions.. |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/config.h> | ||
9 | #include <asm/ptrace.h> | 8 | #include <asm/ptrace.h> |
10 | #include <asm/user.h> | 9 | #include <asm/user.h> |
11 | 10 | ||
diff --git a/include/asm-m68knommu/elia.h b/include/asm-m68knommu/elia.h index f18b8e9d8c36..e037d4e2de33 100644 --- a/include/asm-m68knommu/elia.h +++ b/include/asm-m68knommu/elia.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #define elia_h | 12 | #define elia_h |
13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
14 | 14 | ||
15 | #include <linux/config.h> | ||
16 | #include <asm/coldfire.h> | 15 | #include <asm/coldfire.h> |
17 | 16 | ||
18 | #ifdef CONFIG_eLIA | 17 | #ifdef CONFIG_eLIA |
diff --git a/include/asm-m68knommu/entry.h b/include/asm-m68knommu/entry.h index 06f5aa70b0b5..c2553d26273d 100644 --- a/include/asm-m68knommu/entry.h +++ b/include/asm-m68knommu/entry.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef __M68KNOMMU_ENTRY_H | 1 | #ifndef __M68KNOMMU_ENTRY_H |
2 | #define __M68KNOMMU_ENTRY_H | 2 | #define __M68KNOMMU_ENTRY_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <asm/setup.h> | 4 | #include <asm/setup.h> |
6 | #include <asm/page.h> | 5 | #include <asm/page.h> |
7 | 6 | ||
diff --git a/include/asm-m68knommu/fpu.h b/include/asm-m68knommu/fpu.h index 225082991a03..b16b2e4fca2a 100644 --- a/include/asm-m68knommu/fpu.h +++ b/include/asm-m68knommu/fpu.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef __M68KNOMMU_FPU_H | 1 | #ifndef __M68KNOMMU_FPU_H |
2 | #define __M68KNOMMU_FPU_H | 2 | #define __M68KNOMMU_FPU_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | 4 | ||
6 | /* | 5 | /* |
7 | * MAX floating point unit state size (FSAVE/FRESTORE) | 6 | * MAX floating point unit state size (FSAVE/FRESTORE) |
diff --git a/include/asm-m68knommu/hardirq.h b/include/asm-m68knommu/hardirq.h index 476180f4cba2..980075bab792 100644 --- a/include/asm-m68knommu/hardirq.h +++ b/include/asm-m68knommu/hardirq.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef __M68K_HARDIRQ_H | 1 | #ifndef __M68K_HARDIRQ_H |
2 | #define __M68K_HARDIRQ_H | 2 | #define __M68K_HARDIRQ_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <linux/cache.h> | 4 | #include <linux/cache.h> |
6 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
7 | #include <asm/irq.h> | 6 | #include <asm/irq.h> |
diff --git a/include/asm-m68knommu/io.h b/include/asm-m68knommu/io.h index e08f2ee4b4a2..8df4cee2a0cd 100644 --- a/include/asm-m68knommu/io.h +++ b/include/asm-m68knommu/io.h | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
5 | 5 | ||
6 | #include <linux/config.h> | ||
7 | 6 | ||
8 | /* | 7 | /* |
9 | * These are for ISA/PCI shared memory _only_ and should never be used | 8 | * These are for ISA/PCI shared memory _only_ and should never be used |
diff --git a/include/asm-m68knommu/irq.h b/include/asm-m68knommu/irq.h index 20c48ec858a4..2b408842a30e 100644 --- a/include/asm-m68knommu/irq.h +++ b/include/asm-m68knommu/irq.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _M68K_IRQ_H_ | 1 | #ifndef _M68K_IRQ_H_ |
2 | #define _M68K_IRQ_H_ | 2 | #define _M68K_IRQ_H_ |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <asm/ptrace.h> | 4 | #include <asm/ptrace.h> |
6 | 5 | ||
7 | #ifdef CONFIG_COLDFIRE | 6 | #ifdef CONFIG_COLDFIRE |
diff --git a/include/asm-m68knommu/m5206sim.h b/include/asm-m68knommu/m5206sim.h index d1e7509021c5..7e3594dea88b 100644 --- a/include/asm-m68knommu/m5206sim.h +++ b/include/asm-m68knommu/m5206sim.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #define m5206sim_h | 12 | #define m5206sim_h |
13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
14 | 14 | ||
15 | #include <linux/config.h> | ||
16 | 15 | ||
17 | /* | 16 | /* |
18 | * Define the 5206 SIM register set addresses. | 17 | * Define the 5206 SIM register set addresses. |
diff --git a/include/asm-m68knommu/m520xsim.h b/include/asm-m68knommu/m520xsim.h index 6dc62869e62b..1dac22ea95ba 100644 --- a/include/asm-m68knommu/m520xsim.h +++ b/include/asm-m68knommu/m520xsim.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #define m520xsim_h | 11 | #define m520xsim_h |
12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | 14 | ||
16 | /* | 15 | /* |
17 | * Define the 5282 SIM register set addresses. | 16 | * Define the 5282 SIM register set addresses. |
diff --git a/include/asm-m68knommu/m523xsim.h b/include/asm-m68knommu/m523xsim.h index 926cfb805df7..bf397313e93f 100644 --- a/include/asm-m68knommu/m523xsim.h +++ b/include/asm-m68knommu/m523xsim.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #define m523xsim_h | 11 | #define m523xsim_h |
12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | 14 | ||
16 | /* | 15 | /* |
17 | * Define the 523x SIM register set addresses. | 16 | * Define the 523x SIM register set addresses. |
diff --git a/include/asm-m68knommu/m5272sim.h b/include/asm-m68knommu/m5272sim.h index b40875362f46..6217edc21139 100644 --- a/include/asm-m68knommu/m5272sim.h +++ b/include/asm-m68knommu/m5272sim.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #define m5272sim_h | 12 | #define m5272sim_h |
13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
14 | 14 | ||
15 | #include <linux/config.h> | ||
16 | 15 | ||
17 | /* | 16 | /* |
18 | * Define the 5272 SIM register set addresses. | 17 | * Define the 5272 SIM register set addresses. |
diff --git a/include/asm-m68knommu/m527xsim.h b/include/asm-m68knommu/m527xsim.h index e7878d0f7d7a..1f63ab3fb3e6 100644 --- a/include/asm-m68knommu/m527xsim.h +++ b/include/asm-m68knommu/m527xsim.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #define m527xsim_h | 11 | #define m527xsim_h |
12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | 14 | ||
16 | /* | 15 | /* |
17 | * Define the 5270/5271 SIM register set addresses. | 16 | * Define the 5270/5271 SIM register set addresses. |
diff --git a/include/asm-m68knommu/m528xsim.h b/include/asm-m68knommu/m528xsim.h index 610774a17f70..1a3b1ae06b1e 100644 --- a/include/asm-m68knommu/m528xsim.h +++ b/include/asm-m68knommu/m528xsim.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #define m528xsim_h | 11 | #define m528xsim_h |
12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | 14 | ||
16 | /* | 15 | /* |
17 | * Define the 5280/5282 SIM register set addresses. | 16 | * Define the 5280/5282 SIM register set addresses. |
diff --git a/include/asm-m68knommu/mcfcache.h b/include/asm-m68knommu/mcfcache.h index 9cb401421835..45d1ac57ea82 100644 --- a/include/asm-m68knommu/mcfcache.h +++ b/include/asm-m68knommu/mcfcache.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #define __M68KNOMMU_MCFCACHE_H | 11 | #define __M68KNOMMU_MCFCACHE_H |
12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | 14 | ||
16 | /* | 15 | /* |
17 | * The different ColdFire families have different cache arrangments. | 16 | * The different ColdFire families have different cache arrangments. |
diff --git a/include/asm-m68knommu/mcfdma.h b/include/asm-m68knommu/mcfdma.h index b93f8ba8a248..ea729e81a6be 100644 --- a/include/asm-m68knommu/mcfdma.h +++ b/include/asm-m68knommu/mcfdma.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #define mcfdma_h | 11 | #define mcfdma_h |
12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | 14 | ||
16 | /* | 15 | /* |
17 | * Get address specific defines for this Coldfire member. | 16 | * Get address specific defines for this Coldfire member. |
diff --git a/include/asm-m68knommu/mcfmbus.h b/include/asm-m68knommu/mcfmbus.h index 4762589e858a..13df9d41bd1a 100644 --- a/include/asm-m68knommu/mcfmbus.h +++ b/include/asm-m68knommu/mcfmbus.h | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | #ifndef mcfmbus_h | 12 | #ifndef mcfmbus_h |
13 | #define mcfmbus_h | 13 | #define mcfmbus_h |
14 | #include <linux/config.h> | ||
15 | 14 | ||
16 | 15 | ||
17 | #define MCFMBUS_BASE 0x280 | 16 | #define MCFMBUS_BASE 0x280 |
diff --git a/include/asm-m68knommu/mcfne.h b/include/asm-m68knommu/mcfne.h index a71b1c8cb4f8..c920ccdb61fe 100644 --- a/include/asm-m68knommu/mcfne.h +++ b/include/asm-m68knommu/mcfne.h | |||
@@ -18,7 +18,6 @@ | |||
18 | #define mcfne_h | 18 | #define mcfne_h |
19 | /****************************************************************************/ | 19 | /****************************************************************************/ |
20 | 20 | ||
21 | #include <linux/config.h> | ||
22 | 21 | ||
23 | /* | 22 | /* |
24 | * Support for NE2000 clones devices in ColdFire based boards. | 23 | * Support for NE2000 clones devices in ColdFire based boards. |
diff --git a/include/asm-m68knommu/mcfpci.h b/include/asm-m68knommu/mcfpci.h index d6229047d06e..f1507dd06ec6 100644 --- a/include/asm-m68knommu/mcfpci.h +++ b/include/asm-m68knommu/mcfpci.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #define mcfpci_h | 12 | #define mcfpci_h |
13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
14 | 14 | ||
15 | #include <linux/config.h> | ||
16 | 15 | ||
17 | #ifdef CONFIG_PCI | 16 | #ifdef CONFIG_PCI |
18 | 17 | ||
diff --git a/include/asm-m68knommu/mcfpit.h b/include/asm-m68knommu/mcfpit.h index a685f1b45401..0d2672dd518a 100644 --- a/include/asm-m68knommu/mcfpit.h +++ b/include/asm-m68knommu/mcfpit.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #define mcfpit_h | 11 | #define mcfpit_h |
12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | 14 | ||
16 | /* | 15 | /* |
17 | * Get address specific defines for the 5270/5271, 5280/5282, and 5208. | 16 | * Get address specific defines for the 5270/5271, 5280/5282, and 5208. |
diff --git a/include/asm-m68knommu/mcfsim.h b/include/asm-m68knommu/mcfsim.h index 81d74a31dc43..97a0c2734a72 100644 --- a/include/asm-m68knommu/mcfsim.h +++ b/include/asm-m68knommu/mcfsim.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #define mcfsim_h | 12 | #define mcfsim_h |
13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
14 | 14 | ||
15 | #include <linux/config.h> | ||
16 | 15 | ||
17 | /* | 16 | /* |
18 | * Include 5204, 5206/e, 5235, 5249, 5270/5271, 5272, 5280/5282, | 17 | * Include 5204, 5206/e, 5235, 5249, 5270/5271, 5272, 5280/5282, |
diff --git a/include/asm-m68knommu/mcfsmc.h b/include/asm-m68knommu/mcfsmc.h index 2583900b9591..2d7a4dbd9683 100644 --- a/include/asm-m68knommu/mcfsmc.h +++ b/include/asm-m68knommu/mcfsmc.h | |||
@@ -17,7 +17,6 @@ | |||
17 | * allow 8 bit accesses. So this code is 16bit access only. | 17 | * allow 8 bit accesses. So this code is 16bit access only. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/config.h> | ||
21 | 20 | ||
22 | #undef outb | 21 | #undef outb |
23 | #undef inb | 22 | #undef inb |
diff --git a/include/asm-m68knommu/mcftimer.h b/include/asm-m68knommu/mcftimer.h index 0f47164c33a9..68bf33ac10d1 100644 --- a/include/asm-m68knommu/mcftimer.h +++ b/include/asm-m68knommu/mcftimer.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #define mcftimer_h | 12 | #define mcftimer_h |
13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
14 | 14 | ||
15 | #include <linux/config.h> | ||
16 | 15 | ||
17 | /* | 16 | /* |
18 | * Get address specific defines for this ColdFire member. | 17 | * Get address specific defines for this ColdFire member. |
diff --git a/include/asm-m68knommu/mcfuart.h b/include/asm-m68knommu/mcfuart.h index b016fad83119..8040e43786be 100644 --- a/include/asm-m68knommu/mcfuart.h +++ b/include/asm-m68knommu/mcfuart.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #define mcfuart_h | 12 | #define mcfuart_h |
13 | /****************************************************************************/ | 13 | /****************************************************************************/ |
14 | 14 | ||
15 | #include <linux/config.h> | ||
16 | 15 | ||
17 | /* | 16 | /* |
18 | * Define the base address of the UARTS within the MBAR address | 17 | * Define the base address of the UARTS within the MBAR address |
diff --git a/include/asm-m68knommu/mcfwdebug.h b/include/asm-m68knommu/mcfwdebug.h index 6ceae103596b..27f70e45d700 100644 --- a/include/asm-m68knommu/mcfwdebug.h +++ b/include/asm-m68knommu/mcfwdebug.h | |||
@@ -10,7 +10,6 @@ | |||
10 | #ifndef mcfdebug_h | 10 | #ifndef mcfdebug_h |
11 | #define mcfdebug_h | 11 | #define mcfdebug_h |
12 | /****************************************************************************/ | 12 | /****************************************************************************/ |
13 | #include <linux/config.h> | ||
14 | 13 | ||
15 | /* Define the debug module registers */ | 14 | /* Define the debug module registers */ |
16 | #define MCFDEBUG_CSR 0x0 /* Configuration status */ | 15 | #define MCFDEBUG_CSR 0x0 /* Configuration status */ |
diff --git a/include/asm-m68knommu/mmu_context.h b/include/asm-m68knommu/mmu_context.h index 1e080eca9ca8..6c077d3a2572 100644 --- a/include/asm-m68knommu/mmu_context.h +++ b/include/asm-m68knommu/mmu_context.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef __M68KNOMMU_MMU_CONTEXT_H | 1 | #ifndef __M68KNOMMU_MMU_CONTEXT_H |
2 | #define __M68KNOMMU_MMU_CONTEXT_H | 2 | #define __M68KNOMMU_MMU_CONTEXT_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <asm/setup.h> | 4 | #include <asm/setup.h> |
6 | #include <asm/page.h> | 5 | #include <asm/page.h> |
7 | #include <asm/pgalloc.h> | 6 | #include <asm/pgalloc.h> |
diff --git a/include/asm-m68knommu/nettel.h b/include/asm-m68knommu/nettel.h index 9bda307e6544..0299f6a2deeb 100644 --- a/include/asm-m68knommu/nettel.h +++ b/include/asm-m68knommu/nettel.h | |||
@@ -13,7 +13,6 @@ | |||
13 | #define nettel_h | 13 | #define nettel_h |
14 | /****************************************************************************/ | 14 | /****************************************************************************/ |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | 16 | ||
18 | /****************************************************************************/ | 17 | /****************************************************************************/ |
19 | #ifdef CONFIG_NETtel | 18 | #ifdef CONFIG_NETtel |
diff --git a/include/asm-m68knommu/page.h b/include/asm-m68knommu/page.h index 942dfbead27f..a22bf5a88160 100644 --- a/include/asm-m68knommu/page.h +++ b/include/asm-m68knommu/page.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _M68KNOMMU_PAGE_H | 1 | #ifndef _M68KNOMMU_PAGE_H |
2 | #define _M68KNOMMU_PAGE_H | 2 | #define _M68KNOMMU_PAGE_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | 4 | ||
6 | /* PAGE_SHIFT determines the page size */ | 5 | /* PAGE_SHIFT determines the page size */ |
7 | 6 | ||
diff --git a/include/asm-m68knommu/page_offset.h b/include/asm-m68knommu/page_offset.h index 2b45645e9b29..8ed6d7b7d9d1 100644 --- a/include/asm-m68knommu/page_offset.h +++ b/include/asm-m68knommu/page_offset.h | |||
@@ -1,5 +1,4 @@ | |||
1 | 1 | ||
2 | #include <linux/config.h> | ||
3 | 2 | ||
4 | /* This handles the memory map.. */ | 3 | /* This handles the memory map.. */ |
5 | 4 | ||
diff --git a/include/asm-m68knommu/param.h b/include/asm-m68knommu/param.h index 3f57d5db81f5..4c9904d6512e 100644 --- a/include/asm-m68knommu/param.h +++ b/include/asm-m68knommu/param.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _M68KNOMMU_PARAM_H | 1 | #ifndef _M68KNOMMU_PARAM_H |
2 | #define _M68KNOMMU_PARAM_H | 2 | #define _M68KNOMMU_PARAM_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | 4 | ||
6 | #if defined(CONFIG_CLEOPATRA) | 5 | #if defined(CONFIG_CLEOPATRA) |
7 | #define HZ 1000 | 6 | #define HZ 1000 |
diff --git a/include/asm-m68knommu/pgtable.h b/include/asm-m68knommu/pgtable.h index 00893055e6c2..549ad231efad 100644 --- a/include/asm-m68knommu/pgtable.h +++ b/include/asm-m68knommu/pgtable.h | |||
@@ -7,7 +7,6 @@ | |||
7 | * (C) Copyright 2000-2002, Greg Ungerer <gerg@snapgear.com> | 7 | * (C) Copyright 2000-2002, Greg Ungerer <gerg@snapgear.com> |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/config.h> | ||
11 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
12 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
13 | #include <asm/page.h> | 12 | #include <asm/page.h> |
diff --git a/include/asm-m68knommu/processor.h b/include/asm-m68knommu/processor.h index ba393b1a023b..278b00bc60c5 100644 --- a/include/asm-m68knommu/processor.h +++ b/include/asm-m68knommu/processor.h | |||
@@ -13,7 +13,6 @@ | |||
13 | */ | 13 | */ |
14 | #define current_text_addr() ({ __label__ _l; _l: &&_l;}) | 14 | #define current_text_addr() ({ __label__ _l; _l: &&_l;}) |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | #include <linux/threads.h> | 16 | #include <linux/threads.h> |
18 | #include <asm/types.h> | 17 | #include <asm/types.h> |
19 | #include <asm/segment.h> | 18 | #include <asm/segment.h> |
diff --git a/include/asm-m68knommu/semaphore-helper.h b/include/asm-m68knommu/semaphore-helper.h index a6586417c1c2..43da7bc483c7 100644 --- a/include/asm-m68knommu/semaphore-helper.h +++ b/include/asm-m68knommu/semaphore-helper.h | |||
@@ -9,7 +9,6 @@ | |||
9 | * m68k version by Andreas Schwab | 9 | * m68k version by Andreas Schwab |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | 12 | ||
14 | /* | 13 | /* |
15 | * These two _must_ execute atomically wrt each other. | 14 | * These two _must_ execute atomically wrt each other. |
diff --git a/include/asm-m68knommu/system.h b/include/asm-m68knommu/system.h index 6338afc850ba..2bbe2db00a22 100644 --- a/include/asm-m68knommu/system.h +++ b/include/asm-m68knommu/system.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _M68KNOMMU_SYSTEM_H | 1 | #ifndef _M68KNOMMU_SYSTEM_H |
2 | #define _M68KNOMMU_SYSTEM_H | 2 | #define _M68KNOMMU_SYSTEM_H |
3 | 3 | ||
4 | #include <linux/config.h> /* get configuration macros */ | ||
5 | #include <linux/linkage.h> | 4 | #include <linux/linkage.h> |
6 | #include <asm/segment.h> | 5 | #include <asm/segment.h> |
7 | #include <asm/entry.h> | 6 | #include <asm/entry.h> |
diff --git a/include/asm-m68knommu/unaligned.h b/include/asm-m68knommu/unaligned.h index 8876f034ea64..869e9dd24f54 100644 --- a/include/asm-m68knommu/unaligned.h +++ b/include/asm-m68knommu/unaligned.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef __M68K_UNALIGNED_H | 1 | #ifndef __M68K_UNALIGNED_H |
2 | #define __M68K_UNALIGNED_H | 2 | #define __M68K_UNALIGNED_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | 4 | ||
6 | #ifdef CONFIG_COLDFIRE | 5 | #ifdef CONFIG_COLDFIRE |
7 | 6 | ||
diff --git a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h index 5373988a7e51..1b2abdf281e1 100644 --- a/include/asm-m68knommu/unistd.h +++ b/include/asm-m68knommu/unistd.h | |||
@@ -286,6 +286,8 @@ | |||
286 | #define __NR_request_key 280 | 286 | #define __NR_request_key 280 |
287 | #define __NR_keyctl 281 | 287 | #define __NR_keyctl 281 |
288 | 288 | ||
289 | #ifdef __KERNEL__ | ||
290 | |||
289 | #define NR_syscalls 282 | 291 | #define NR_syscalls 282 |
290 | 292 | ||
291 | /* user-visible error numbers are in the range -1 - -122: see | 293 | /* user-visible error numbers are in the range -1 - -122: see |
@@ -437,7 +439,6 @@ type name(atype a, btype b, ctype c, dtype d, etype e) \ | |||
437 | return (type)__res; \ | 439 | return (type)__res; \ |
438 | } | 440 | } |
439 | 441 | ||
440 | #ifdef __KERNEL__ | ||
441 | #define __ARCH_WANT_IPC_PARSE_VERSION | 442 | #define __ARCH_WANT_IPC_PARSE_VERSION |
442 | #define __ARCH_WANT_OLD_READDIR | 443 | #define __ARCH_WANT_OLD_READDIR |
443 | #define __ARCH_WANT_OLD_STAT | 444 | #define __ARCH_WANT_OLD_STAT |
@@ -460,7 +461,6 @@ type name(atype a, btype b, ctype c, dtype d, etype e) \ | |||
460 | #define __ARCH_WANT_SYS_SIGPENDING | 461 | #define __ARCH_WANT_SYS_SIGPENDING |
461 | #define __ARCH_WANT_SYS_SIGPROCMASK | 462 | #define __ARCH_WANT_SYS_SIGPROCMASK |
462 | #define __ARCH_WANT_SYS_RT_SIGACTION | 463 | #define __ARCH_WANT_SYS_RT_SIGACTION |
463 | #endif | ||
464 | 464 | ||
465 | #ifdef __KERNEL_SYSCALLS__ | 465 | #ifdef __KERNEL_SYSCALLS__ |
466 | 466 | ||
@@ -515,7 +515,7 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
515 | struct sigaction __user *oact, | 515 | struct sigaction __user *oact, |
516 | size_t sigsetsize); | 516 | size_t sigsetsize); |
517 | 517 | ||
518 | #endif | 518 | #endif /* __KERNEL_SYSCALLS__ */ |
519 | 519 | ||
520 | /* | 520 | /* |
521 | * "Conditional" syscalls | 521 | * "Conditional" syscalls |
@@ -525,4 +525,5 @@ asmlinkage long sys_rt_sigaction(int sig, | |||
525 | */ | 525 | */ |
526 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | 526 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") |
527 | 527 | ||
528 | #endif /* __KERNEL__ */ | ||
528 | #endif /* _ASM_M68K_UNISTD_H_ */ | 529 | #endif /* _ASM_M68K_UNISTD_H_ */ |