Author: stepan Date: 2007-06-27 22:39:24 +0200 (Wed, 27 Jun 2007) New Revision: 382
Removed: LinuxBIOSv3/include/device/pnp_def.h Modified: LinuxBIOSv3/device/pnp_raw.c LinuxBIOSv3/include/device/pnp.h Log: remove trivial file as suggested by Uwe.
Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: LinuxBIOSv3/device/pnp_raw.c =================================================================== --- LinuxBIOSv3/device/pnp_raw.c 2007-06-27 20:38:27 UTC (rev 381) +++ LinuxBIOSv3/device/pnp_raw.c 2007-06-27 20:39:24 UTC (rev 382) @@ -18,7 +18,7 @@ */
#include <types.h> -#include <device/pnp_def.h> +#include <device/pnp.h> #include <io.h>
/* very low level pnp manipulation intended for stage 0 or 1 */
Modified: LinuxBIOSv3/include/device/pnp.h =================================================================== --- LinuxBIOSv3/include/device/pnp.h 2007-06-27 20:38:27 UTC (rev 381) +++ LinuxBIOSv3/include/device/pnp.h 2007-06-27 20:39:24 UTC (rev 382) @@ -22,7 +22,6 @@
#include <types.h> #include <device/device.h> -#include <device/pnp_def.h>
/* very low level pnp manipulation intended for stage 0 or 1 */ void rawpnp_enter_ext_func_mode(u16 dev); @@ -74,4 +73,13 @@ void pnp_enable_devices(struct device *dev, struct device_operations *ops, unsigned functions, struct pnp_info *info);
+#define PNP_IDX_IO0 0x60 +#define PNP_IDX_IO1 0x62 +#define PNP_IDX_IO2 0x64 +#define PNP_IDX_IO3 0x66 +#define PNP_IDX_IRQ0 0x70 +#define PNP_IDX_IRQ1 0x72 +#define PNP_IDX_DRQ0 0x74 +#define PNP_IDX_DRQ1 0x75 + #endif /* DEVICE_PNP_H */
Deleted: LinuxBIOSv3/include/device/pnp_def.h =================================================================== --- LinuxBIOSv3/include/device/pnp_def.h 2007-06-27 20:38:27 UTC (rev 381) +++ LinuxBIOSv3/include/device/pnp_def.h 2007-06-27 20:39:24 UTC (rev 382) @@ -1,30 +0,0 @@ -/* - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -#ifndef DEVICE_PNP_DEF_H -#define DEVICE_PNP_DEF_H - -#define PNP_IDX_IO0 0x60 -#define PNP_IDX_IO1 0x62 -#define PNP_IDX_IO2 0x64 -#define PNP_IDX_IO3 0x66 -#define PNP_IDX_IRQ0 0x70 -#define PNP_IDX_IRQ1 0x72 -#define PNP_IDX_DRQ0 0x74 -#define PNP_IDX_DRQ1 0x75 - -#endif /* DEVICE_PNP_DEF_H */