diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-03 03:38:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-03 03:38:21 -0700 |
| commit | c2e2d4f7c91100686c8d9987299058307452ddd6 (patch) | |
| tree | 26a5ad76b5144648a7d5306f911ae3b15515c747 /include/linux | |
| parent | ed2110ce4db8a25d186a00f6a338170ee7ca2cd7 (diff) | |
| parent | 6f79387d2321847e687b61f9711606b58f23b859 (diff) | |
Merge bk://ldm.bkbits.net/linux-2.5-core
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 1 | ||||
| -rw-r--r-- | include/linux/smp.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 706819e9a27c..c6a8f20203ec 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1115,7 +1115,6 @@ typedef struct { #ifdef CONFIG_PROC_FS extern void proc_ide_create(void); extern void proc_ide_destroy(void); -extern void recreate_proc_ide_device(ide_hwif_t *, ide_drive_t *); extern void destroy_proc_ide_device(ide_hwif_t *, ide_drive_t *); extern void destroy_proc_ide_drives(ide_hwif_t *); extern void create_proc_ide_interfaces(void); diff --git a/include/linux/smp.h b/include/linux/smp.h index 194d2f5ecb87..98f235eec967 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h @@ -110,7 +110,6 @@ void smp_prepare_boot_cpu(void); #define smp_call_function(func,info,retry,wait) ({ 0; }) #define on_each_cpu(func,info,retry,wait) ({ func(info); 0; }) static inline void smp_send_reschedule(int cpu) { } -static inline void smp_send_reschedule_all(void) { } #define cpu_online_map 1 #define cpu_online(cpu) ({ BUG_ON((cpu) != 0); 1; }) #define num_online_cpus() 1 |