diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 20:13:30 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 20:13:30 +0100 |
| commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
| tree | 9b08af78085334af44414adafe0096276f8fe0ff /arch/cris/arch-v10/drivers/pcf8563.c | |
| parent | [ARM] Merge remaining IOP code (diff) | |
| parent | [ARM] 4165/1: S3C24XX: Select CONFIG_NO_IOPORT (diff) | |
| download | linux-5a84d159061d914c8dd4aa372ac6e9529c2be453.tar.xz linux-5a84d159061d914c8dd4aa372ac6e9529c2be453.zip | |
Merge ARM fixes
Diffstat (limited to 'arch/cris/arch-v10/drivers/pcf8563.c')
| -rw-r--r-- | arch/cris/arch-v10/drivers/pcf8563.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/drivers/pcf8563.c b/arch/cris/arch-v10/drivers/pcf8563.c index 8c830eefc89c..d47cfbf98d6e 100644 --- a/arch/cris/arch-v10/drivers/pcf8563.c +++ b/arch/cris/arch-v10/drivers/pcf8563.c @@ -56,7 +56,7 @@ static const unsigned char days_in_month[] = int pcf8563_ioctl(struct inode *, struct file *, unsigned int, unsigned long); -static struct file_operations pcf8563_fops = { +static const struct file_operations pcf8563_fops = { .owner = THIS_MODULE, .ioctl = pcf8563_ioctl, }; @@ -311,7 +311,7 @@ pcf8563_register(void) { pcf8563_init(); if (register_chrdev(PCF8563_MAJOR, DEVICE_NAME, &pcf8563_fops) < 0) { - printk(KERN_INFO "%s: Unable to get major numer %d for RTC device.\n", + printk(KERN_INFO "%s: Unable to get major number %d for RTC device.\n", PCF8563_NAME, PCF8563_MAJOR); return -1; } |