move MODULE_ALIAS_LDISC definition to include/linux/termio.h
PATCH 1/1 move MODULE_ALIAS_LDISC definition to include/linux/termio.h
Please don't add non-machine-specific macros to machine-specific include files.
Thank you.
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1105 -> 1.1106
# include/asm-i386/termios.h 1.4 -> 1.5
# include/linux/termios.h 1.1 -> 1.2
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/09/06 [email protected] 1.1106
# Move MODULE_ALIAS_LDISC declaration to include/linux/termios.h # --------------------------------------------
#
include/asm-i386/termios.h +0 -3
@@ -58,7 +58,6 @@#define N_HCI 15/* Bluetooth HCI UART */ #ifdef __KERNEL__ -#include <linux/module.h> /* intr=^C quit=^\ erase=del kill=^U eof=^D vtime=\0 vmin=\1 sxtc=\0
@@ -102,8 +101,6 @@#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 */
include/linux/termios.h +7 -0
@@ -4,4 +4,11 @@#include <linux/types.h> #include <asm/termios.h> +#ifdef __KERNEL__ +#include <linux/module.h> + +#define MODULE_ALIAS_LDISC (ldisc) \ + MODULE_ALIAS("tty-ldisc-" __stringify(ldisc)) +#endif /* __KERNEL__ */ +#endif
Quoted 2 lines · Matthias Urlichs
Please don't add non-machine-specific macros to machine-specific include files.
A more complete fix has already gone in for this.
Signature · 5 lines
Russell King ([email protected]) http://www.arm.linux.org.uk/personal/ Linux kernel maintainer of: 2.6 ARM Linux - http://www.arm.linux.org.uk/ 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/ 2.6 Serial core