X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fisapnp.h;h=1e8728a9ee8a0bce0e05e1fa41cb47a09876d053;hb=refs%2Fheads%2Fvserver;hp=b929eee854abcd8b258af93c1133980e19c76aa8;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/include/linux/isapnp.h b/include/linux/isapnp.h index b929eee85..1e8728a9e 100644 --- a/include/linux/isapnp.h +++ b/include/linux/isapnp.h @@ -22,7 +22,6 @@ #ifndef LINUX_ISAPNP_H #define LINUX_ISAPNP_H -#include #include #include @@ -100,16 +99,7 @@ int isapnp_present(void); int isapnp_cfg_begin(int csn, int device); int isapnp_cfg_end(void); unsigned char isapnp_read_byte(unsigned char idx); -unsigned short isapnp_read_word(unsigned char idx); -unsigned int isapnp_read_dword(unsigned char idx); void isapnp_write_byte(unsigned char idx, unsigned char val); -void isapnp_write_word(unsigned char idx, unsigned short val); -void isapnp_write_dword(unsigned char idx, unsigned int val); -void isapnp_wake(unsigned char csn); -void isapnp_device(unsigned char device); -void isapnp_activate(unsigned char device); -void isapnp_deactivate(unsigned char device); -void *isapnp_alloc(long size); #ifdef CONFIG_PROC_FS int isapnp_proc_init(void); @@ -119,9 +109,6 @@ static inline int isapnp_proc_init(void) { return 0; } static inline int isapnp_proc_done(void) { return 0; } #endif -/* init/main.c */ -int isapnp_init(void); - /* compat */ struct pnp_card *pnp_find_card(unsigned short vendor, unsigned short device, @@ -138,15 +125,7 @@ static inline int isapnp_present(void) { return 0; } static inline int isapnp_cfg_begin(int csn, int device) { return -ENODEV; } static inline int isapnp_cfg_end(void) { return -ENODEV; } static inline unsigned char isapnp_read_byte(unsigned char idx) { return 0xff; } -static inline unsigned short isapnp_read_word(unsigned char idx) { return 0xffff; } -static inline unsigned int isapnp_read_dword(unsigned char idx) { return 0xffffffff; } static inline void isapnp_write_byte(unsigned char idx, unsigned char val) { ; } -static inline void isapnp_write_word(unsigned char idx, unsigned short val) { ; } -static inline void isapnp_write_dword(unsigned char idx, unsigned int val) { ; } -static inline void isapnp_wake(unsigned char csn) { ; } -static inline void isapnp_device(unsigned char device) { ; } -static inline void isapnp_activate(unsigned char device) { ; } -static inline void isapnp_deactivate(unsigned char device) { ; } static inline struct pnp_card *pnp_find_card(unsigned short vendor, unsigned short device,