diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
| commit | 43d2548bb2ef7e6d753f91468a746784041e522d (patch) | |
| tree | 77d13fcd48fd998393abb825ec36e2b732684a73 /drivers/char/ip2 | |
| parent | 585583d95c5660973bc0cf64add517b040acd8a4 (diff) | |
| parent | 85082fd7cbe3173198aac0eb5e85ab1edcc6352c (diff) | |
Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
Manual fixup of:
arch/powerpc/Kconfig
Diffstat (limited to 'drivers/char/ip2')
| -rw-r--r-- | drivers/char/ip2/ip2main.c | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index c12cf8fc4be0..61b6fe4156bb 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c | |||
| @@ -98,6 +98,7 @@ | |||
| 98 | #include <linux/major.h> | 98 | #include <linux/major.h> |
| 99 | #include <linux/wait.h> | 99 | #include <linux/wait.h> |
| 100 | #include <linux/device.h> | 100 | #include <linux/device.h> |
| 101 | #include <linux/smp_lock.h> | ||
| 101 | 102 | ||
| 102 | #include <linux/tty.h> | 103 | #include <linux/tty.h> |
| 103 | #include <linux/tty_flip.h> | 104 | #include <linux/tty_flip.h> |
| @@ -2908,42 +2909,11 @@ ip2_ipl_ioctl ( struct inode *pInode, struct file *pFile, UINT cmd, ULONG arg ) | |||
| 2908 | static int | 2909 | static int |
| 2909 | ip2_ipl_open( struct inode *pInode, struct file *pFile ) | 2910 | ip2_ipl_open( struct inode *pInode, struct file *pFile ) |
| 2910 | { | 2911 | { |
| 2911 | unsigned int iplminor = iminor(pInode); | ||
| 2912 | i2eBordStrPtr pB; | ||
| 2913 | i2ChanStrPtr pCh; | ||
| 2914 | 2912 | ||
| 2915 | #ifdef IP2DEBUG_IPL | 2913 | #ifdef IP2DEBUG_IPL |
| 2916 | printk (KERN_DEBUG "IP2IPL: open\n" ); | 2914 | printk (KERN_DEBUG "IP2IPL: open\n" ); |
| 2917 | #endif | 2915 | #endif |
| 2918 | 2916 | cycle_kernel_lock(); | |
| 2919 | switch(iplminor) { | ||
| 2920 | // These are the IPL devices | ||
| 2921 | case 0: | ||
| 2922 | case 4: | ||
| 2923 | case 8: | ||
| 2924 | case 12: | ||
| 2925 | break; | ||
| 2926 | |||
| 2927 | // These are the status devices | ||
| 2928 | case 1: | ||
| 2929 | case 5: | ||
| 2930 | case 9: | ||
| 2931 | case 13: | ||
| 2932 | break; | ||
| 2933 | |||
| 2934 | // These are the debug devices | ||
| 2935 | case 2: | ||
| 2936 | case 6: | ||
| 2937 | case 10: | ||
| 2938 | case 14: | ||
| 2939 | pB = i2BoardPtrTable[iplminor / 4]; | ||
| 2940 | pCh = (i2ChanStrPtr) pB->i2eChannelPtr; | ||
| 2941 | break; | ||
| 2942 | |||
| 2943 | // This is the trace device | ||
| 2944 | case 3: | ||
| 2945 | break; | ||
| 2946 | } | ||
| 2947 | return 0; | 2917 | return 0; |
| 2948 | } | 2918 | } |
| 2949 | 2919 | ||