[PATCH] Move MODULE_ALIAS_LDISC to tty_ldisc.h

MODULE_ALIAS_LDISC() is not in any way architecture-specific, so don't
put it in architecture header files.

Here's a patch which moves it to a more sensible location.

diff --git a/include/asm-i386/termios.h b/include/asm-i386/termios.h
index c0fded99548928d464ab4268e1782614933190f5..03f548536d6b1f421cec52c2438eb36802af2bd0 100644 (file)
--- a/include/asm-i386/termios.h
+++ b/include/asm-i386/termios.h
@@ -102,8 +102,6 @@ struct termio {
 #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
 #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
 
-#define MODULE_ALIAS_LDISC(ldisc) \
-       MODULE_ALIAS("tty-ldisc-" __stringify(ldisc))
 #endif /* __KERNEL__ */
 
 #endif /* _I386_TERMIOS_H */

diff --git a/include/asm-sparc/termios.h b/include/asm-sparc/termios.h
index 48ba080c0794cd7491d4c8c14352689afc81c228..0a8ad4cac125c68825139282e79e7ca8a449bafe 100644 (file)
--- a/include/asm-sparc/termios.h
+++ b/include/asm-sparc/termios.h
@@ -169,9 +169,6 @@ struct winsize {
        0; \
 })
 
-#define MODULE_ALIAS_LDISC(ldisc) \
-       MODULE_ALIAS("tty-ldisc-" __stringify(ldisc))
-
 #endif /* __KERNEL__ */
 
 #endif /* _SPARC_TERMIOS_H */

diff --git a/include/asm-sparc64/termios.h b/include/asm-sparc64/termios.h
index 4e7fef518a2525d5efb257b2ec97c6965a994b82..8effce0da0878f054ec6b3514a3f34b00a385fa5 100644 (file)
--- a/include/asm-sparc64/termios.h
+++ b/include/asm-sparc64/termios.h
@@ -168,9 +168,6 @@ struct winsize {
        0; \
 })
 
-#define MODULE_ALIAS_LDISC(ldisc) \
-       MODULE_ALIAS("tty-ldisc-" __stringify(ldisc))
-
 #endif /* __KERNEL__ */
 
 #endif /* _SPARC64_TERMIOS_H */

diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index ac8ac46845ba0907f57d6a5879ceaf03cea3fe32..c851b7dc997e83753c6db2bfa9ff610e99dcf65c 100644 (file)
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -138,4 +138,7 @@ struct tty_ldisc {
 
 #define LDISC_FLAG_DEFINED     0x00000001
 
+#define MODULE_ALIAS_LDISC(ldisc) \
+       MODULE_ALIAS("tty-ldisc-" __stringify(ldisc))
+
 #endif /* _LINUX_TTY_LDISC_H */