diff options
| author | Colin Cross <ccross@android.com> | 2011-08-10 18:04:43 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-10 18:04:43 -0700 |
| commit | d2c3c40789e6645e40c8538182acf7a6831d1db3 (patch) | |
| tree | 39d26f98a61fbed58d59586bbc7fe97b176e4c33 /include/linux/sdla.h | |
| parent | 526bc12ba4772b1301dfaae17572181f4a82cb41 (diff) | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
| download | kernel_samsung_tuna-d2c3c40789e6645e40c8538182acf7a6831d1db3.zip kernel_samsung_tuna-d2c3c40789e6645e40c8538182acf7a6831d1db3.tar.gz kernel_samsung_tuna-d2c3c40789e6645e40c8538182acf7a6831d1db3.tar.bz2 | |
Merge commit 'v3.0' into linux-omap-3.0
Diffstat (limited to 'include/linux/sdla.h')
| -rw-r--r-- | include/linux/sdla.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/sdla.h b/include/linux/sdla.h index 564acd3..9995c7f 100644 --- a/include/linux/sdla.h +++ b/include/linux/sdla.h @@ -112,11 +112,7 @@ struct sdla_dlci_conf { short Tb_max; }; -#ifndef __KERNEL__ - -void sdla(void *cfg_info, char *dev, struct frad_conf *conf, int quiet); - -#else +#ifdef __KERNEL__ /* important Z80 window addresses */ #define SDLA_CONTROL_WND 0xE000 |