Drop patch bq_matan.diff (now part of board-rx51-peripherals.patch and bq27x00_batter...

diff --git a/kernel-power-2.6.28/debian/patches/bq_matan.diff b/kernel-power-2.6.28/debian/patches/bq_matan.diff
deleted file mode 100644 (file)
index 4374438..0000000
--- a/kernel-power-2.6.28/debian/patches/bq_matan.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- kernel-maemo-2.6.28.orig/drivers/power/bq27x00_battery.c
-+++ kernel-maemo-2.6.28/drivers/power/bq27x00_battery.c
-@@ -358,6 +358,22 @@
-       .id_table = bq27200_id,
- };
- 
-+struct bq27200_platform_data {
-+      int dummy;
-+};
-+
-+static struct bq27200_platform_data bq27200_config = {
-+      .dummy = 0,
-+};
-+
-+static struct i2c_board_info rx51_camera_board_info_2 =
-+      {
-+              I2C_BOARD_INFO("bq27200", 0x55),
-+              .platform_data = &bq27200_config,
-+      };
-+
-+static struct i2c_client *client;
-+
- static int __init bq27x00_battery_init(void)
- {
-       int ret;
-@@ -365,6 +381,7 @@
-       ret = i2c_add_driver(&bq27200_battery_driver);
-       if (ret)
-               printk(KERN_ERR "Unable to register BQ27200 driver\n");
-+      client = i2c_new_device(i2c_get_adapter(2), &rx51_camera_board_info_2);
- 
-       return ret;
- }

diff --git a/kernel-power-2.6.28/debian/patches/series b/kernel-power-2.6.28/debian/patches/series
index 3e74e7f..25eceeb 100644 (file)
--- a/kernel-power-2.6.28/debian/patches/series
+++ b/kernel-power-2.6.28/debian/patches/series
@@ -12,7 +12,6 @@ ppp_async_matan.diff
 2.6.28.10.diff
 block2mtd-yoush.diff
 gentoo-fsfixes.diff
-bq_matan.diff
 trig-keyb.diff
 twl-scrollock.diff
 squashfs.diff