git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.7-1.492
[linux-2.6.git]
/
drivers
/
char
/
misc.c
diff --git
a/drivers/char/misc.c
b/drivers/char/misc.c
index
a878d99
..
13b1127
100644
(file)
--- a/
drivers/char/misc.c
+++ b/
drivers/char/misc.c
@@
-63,13
+63,8
@@
static DECLARE_MUTEX(misc_sem);
#define DYNAMIC_MINORS 64 /* like dynamic majors */
static unsigned char misc_minors[DYNAMIC_MINORS / 8];
#define DYNAMIC_MINORS 64 /* like dynamic majors */
static unsigned char misc_minors[DYNAMIC_MINORS / 8];
-#ifdef CONFIG_SGI_NEWPORT_GFX
-extern void gfx_register(void);
-#endif
-extern void streamable_init(void);
extern int rtc_DP8570A_init(void);
extern int rtc_MK48T08_init(void);
extern int rtc_DP8570A_init(void);
extern int rtc_MK48T08_init(void);
-extern int ds1286_init(void);
extern int pmu_device_init(void);
extern int tosh_init(void);
extern int i8k_init(void);
extern int pmu_device_init(void);
extern int tosh_init(void);
extern int i8k_init(void);
@@
-318,21
+313,9
@@
static int __init misc_init(void)
#ifdef CONFIG_BVME6000
rtc_DP8570A_init();
#endif
#ifdef CONFIG_BVME6000
rtc_DP8570A_init();
#endif
-#ifdef CONFIG_SGI_DS1286
- ds1286_init();
-#endif
#ifdef CONFIG_PMAC_PBOOK
pmu_device_init();
#endif
#ifdef CONFIG_PMAC_PBOOK
pmu_device_init();
#endif
-#ifdef CONFIG_SGI_NEWPORT_GFX
- gfx_register ();
-#endif
-#ifdef CONFIG_SGI_IP22
- streamable_init ();
-#endif
-#ifdef CONFIG_SGI_NEWPORT_GFX
- gfx_register ();
-#endif
#ifdef CONFIG_TOSHIBA
tosh_init();
#endif
#ifdef CONFIG_TOSHIBA
tosh_init();
#endif