← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/parisc/eisa_eeprom.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/parisc/eisa_eeprom.c
24
24
#include <linux/kernel.h>
25
25
#include <linux/miscdevice.h>
26
26
#include <linux/slab.h>
27
 
#include <linux/smp_lock.h>
28
27
#include <linux/fs.h>
29
28
#include <asm/io.h>
30
29
#include <asm/uaccess.h>
75
74
        return ret;
76
75
}
77
76
 
78
 
static int eisa_eeprom_ioctl(struct inode *inode, struct file *file, 
79
 
                           unsigned int cmd,
80
 
                           unsigned long arg)
81
 
{
82
 
        return -ENOTTY;
83
 
}
84
 
 
85
77
static int eisa_eeprom_open(struct inode *inode, struct file *file)
86
78
{
87
 
        cycle_kernel_lock();
88
 
 
89
79
        if (file->f_mode & FMODE_WRITE)
90
80
                return -EINVAL;
91
81
   
104
94
        .owner =        THIS_MODULE,
105
95
        .llseek =       eisa_eeprom_llseek,
106
96
        .read =         eisa_eeprom_read,
107
 
        .ioctl =        eisa_eeprom_ioctl,
108
97
        .open =         eisa_eeprom_open,
109
98
        .release =      eisa_eeprom_release,
110
99
};