diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 17:19:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 17:19:21 -0400 |
commit | 602cada851b28c5792339786efe872fbdc1f5d41 (patch) | |
tree | 233d474b74d6038b5bb54a07ad91dd1bb10b0218 /drivers/serial/s3c2410.c | |
parent | 82991c6f2c361acc17279b8124d9bf1878973435 (diff) | |
parent | fee68d1cc0d9bd863e51c16cdcd707737b16bb38 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6: (22 commits)
[PATCH] devfs: Remove it from the feature_removal.txt file
[PATCH] devfs: Last little devfs cleanups throughout the kernel tree.
[PATCH] devfs: Rename TTY_DRIVER_NO_DEVFS to TTY_DRIVER_DYNAMIC_DEV
[PATCH] devfs: Remove the tty_driver devfs_name field as it's no longer needed
[PATCH] devfs: Remove the line_driver devfs_name field as it's no longer needed
[PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed
[PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed
[PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer needed
[PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree
[PATCH] devfs: Remove devfs_remove() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_bdev() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_symlink() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_dir() function from the kernel tree
[PATCH] devfs: Remove devfs_*_tape() functions from the kernel tree
[PATCH] devfs: Remove devfs support from the sound subsystem
[PATCH] devfs: Remove devfs support from the ide subsystem.
[PATCH] devfs: Remove devfs support from the serial subsystem
[PATCH] devfs: Remove devfs from the init code
[PATCH] devfs: Remove devfs from the partition code
...
Diffstat (limited to 'drivers/serial/s3c2410.c')
-rw-r--r-- | drivers/serial/s3c2410.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index 837b6da520b3..4c62ab949ecc 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c | |||
@@ -149,7 +149,6 @@ s3c24xx_serial_dbg(const char *fmt, ...) | |||
149 | /* UART name and device definitions */ | 149 | /* UART name and device definitions */ |
150 | 150 | ||
151 | #define S3C24XX_SERIAL_NAME "ttySAC" | 151 | #define S3C24XX_SERIAL_NAME "ttySAC" |
152 | #define S3C24XX_SERIAL_DEVFS "tts/" | ||
153 | #define S3C24XX_SERIAL_MAJOR 204 | 152 | #define S3C24XX_SERIAL_MAJOR 204 |
154 | #define S3C24XX_SERIAL_MINOR 64 | 153 | #define S3C24XX_SERIAL_MINOR 64 |
155 | 154 | ||
@@ -952,7 +951,6 @@ static struct uart_driver s3c24xx_uart_drv = { | |||
952 | .nr = 3, | 951 | .nr = 3, |
953 | .cons = S3C24XX_SERIAL_CONSOLE, | 952 | .cons = S3C24XX_SERIAL_CONSOLE, |
954 | .driver_name = S3C24XX_SERIAL_NAME, | 953 | .driver_name = S3C24XX_SERIAL_NAME, |
955 | .devfs_name = S3C24XX_SERIAL_DEVFS, | ||
956 | .major = S3C24XX_SERIAL_MAJOR, | 954 | .major = S3C24XX_SERIAL_MAJOR, |
957 | .minor = S3C24XX_SERIAL_MINOR, | 955 | .minor = S3C24XX_SERIAL_MINOR, |
958 | }; | 956 | }; |