diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 14:38:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 14:38:54 -0700 |
| commit | add2b10f2ba15ac231181306c975e58d26f9bd54 (patch) | |
| tree | e3196992ab39adfa42a4fe4234f9f6b2ce0ba5b1 /arch/alpha/kernel/proto.h | |
| parent | 3c5dff7b5ec7ac1bf356d43ac37e2e4ec7ec063a (diff) | |
| parent | 3e073367a57d41e506f20aebb98e308387ce3090 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Fix printk format errors
alpha: convert perf_event to use local_t
Fix call to replaced SuperIO functions
alpha: remove homegrown L1_CACHE_ALIGN macro
Diffstat (limited to 'arch/alpha/kernel/proto.h')
| -rw-r--r-- | arch/alpha/kernel/proto.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/alpha/kernel/proto.h b/arch/alpha/kernel/proto.h index 3d2627ec986..d3e52d3fd59 100644 --- a/arch/alpha/kernel/proto.h +++ b/arch/alpha/kernel/proto.h @@ -156,9 +156,6 @@ extern void SMC669_Init(int); /* es1888.c */ extern void es1888_init(void); -/* ns87312.c */ -extern void ns87312_enable_ide(long ide_base); - /* ../lib/fpreg.c */ extern void alpha_write_fp_reg (unsigned long reg, unsigned long val); extern unsigned long alpha_read_fp_reg (unsigned long reg); |