summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k/macintosh.h
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2008-07-25 16:40:14 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2008-07-25 16:40:14 +0200
commitff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch)
tree85205005c611ab774702148558321c6fb92f1ccd /include/asm-m68k/macintosh.h
parentCPUFREQ: S3C24XX NAND driver frequency scaling support. (diff)
parentUBI: always start the background thread (diff)
downloadlinux-ff877ea80efa2015b6263766f78ee42c2a1b32f9.tar.xz
linux-ff877ea80efa2015b6263766f78ee42c2a1b32f9.zip
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/asm-m68k/macintosh.h')
-rw-r--r--include/asm-m68k/macintosh.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-m68k/macintosh.h b/include/asm-m68k/macintosh.h
index 28b0f49ee521..05309f7e3d06 100644
--- a/include/asm-m68k/macintosh.h
+++ b/include/asm-m68k/macintosh.h
@@ -12,8 +12,6 @@ extern void mac_reset(void);
extern void mac_poweroff(void);
extern void mac_init_IRQ(void);
extern int mac_irq_pending(unsigned int);
-extern void mac_identify(void);
-extern void mac_report_hardware(void);
/*
* Floppy driver magic hook - probably shouldnt be here
@@ -21,9 +19,6 @@ extern void mac_report_hardware(void);
extern void via1_set_head(int);
-extern void parse_booter(char *ptr);
-extern void print_booter(char *ptr);
-
/*
* Macintosh Table
*/